Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 12 months ago
parent
commit
86f4f503fc
  1. 30
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/DetailsListVo.java
  2. 44
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentDetailsVo.java
  3. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java
  4. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java
  5. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java
  6. 11
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
  7. 2
      yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
  8. 10
      yxt-as-ui/src/views/operation/preregistration/preregistration.vue
  9. 82
      yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
  10. 16
      yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue
  11. 3
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java
  12. 3
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java
  13. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java
  14. 14
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/TrackLogsVo.java
  15. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java
  16. 10
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java
  17. 10
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
  18. 6
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java
  19. 15
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
  20. 6
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
  21. 8
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java
  22. 13
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
  23. 8
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java
  24. 8
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java
  25. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java
  26. 8
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml
  27. 8
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
  28. 5
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java
  29. 1
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java
  30. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java
  31. 3
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java
  32. 8
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml
  33. 5
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java
  34. 45
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
  35. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java
  36. 3
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.java
  37. 8
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml
  38. 6
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java
  39. 1
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.java
  40. 8
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml
  41. 13
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
  42. 17
      yxt-base-biz/src/main/java/com/yxt/base/utils/PinYinUtils.java
  43. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java
  44. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java
  45. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java
  46. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java
  47. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java
  48. 9
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
  49. 5
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java
  50. 21
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java
  51. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java
  52. 9
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml
  53. 12
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java
  54. 13
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java
  55. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java
  56. 9
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml
  57. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java
  58. 15
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
  59. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java
  60. 9
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
  61. 5
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java
  62. 20
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java

30
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/DetailsListVo.java

@ -0,0 +1,30 @@
package com.yxt.anrui.riskcenter.api.loanrepaymentschedule;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/5/11 17:06
*/
@Data
public class DetailsListVo {
@ApiModelProperty("主产品首期月还")
private String mainFirstRepay;
@ApiModelProperty("主产品期间月还")
private String mainMidRepay;
@ApiModelProperty("主产品期末月还")
private String mainLastRepay;
@ApiModelProperty("其他融首期月还")
private String otherFirstRepay;
@ApiModelProperty("其他融期间月还")
private String otherMidRepay;
@ApiModelProperty("其他融期末月还")
private String otherLastRepay;
@ApiModelProperty("车架号")
private String vinNo;
private String busVinSid;
}

44
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentDetailsVo.java

@ -0,0 +1,44 @@
package com.yxt.anrui.riskcenter.api.loanrepaymentschedule;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Fan
* @description
* @date 2024/5/11 16:38
*/
@Data
public class LoanRepaymentDetailsVo {
private String sid;
@ApiModelProperty("消贷合同编号")
private String loanContractNo;
@ApiModelProperty("借款人名称")
private String borrowerName;
@ApiModelProperty("贷款总金额")
private String amountAll;
@ApiModelProperty("车辆台数")
private String vehCount;
@ApiModelProperty("金融产品名称")
private String policyName;
@ApiModelProperty("主产品贷款金额")
private String loanAmount;
@ApiModelProperty("主产品期数")
private String mainPeriod;
@ApiModelProperty("主产品首期还款日")
private String mainRepayDate;
@ApiModelProperty("其他融资方")
private String otherPolicyName;
@ApiModelProperty("其他融贷款金额")
private String otherAmount;
@ApiModelProperty("其他融期数")
private String otherPeriod;
@ApiModelProperty("其他融首期还款日")
private String otherRepayDate;
private List<DetailsListVo> vinList = new ArrayList<>();
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java

@ -38,6 +38,11 @@ public interface LoanRepaymentScheduleFeign {
@ResponseBody
public ResultBean<LoanRepaymentSchedule> fetchBySid(@RequestParam("sid") String sid);
@ApiOperation("查看详情页")
@GetMapping("/scheduleDetails")
@ResponseBody
public ResultBean<LoanRepaymentDetailsVo> scheduleDetails(@RequestParam("salesOrderSid") String salesOrderSid);
@PostMapping("/exportExcel")
@ApiOperation(value = "还款计划表导出")

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java

@ -28,6 +28,11 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule
return null;
}
@Override
public ResultBean<LoanRepaymentDetailsVo> scheduleDetails(String salesOrderSid) {
return null;
}
@Override
public ResultBean exportExcel(List<String> sids) {
return null;

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java

@ -44,6 +44,11 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign {
return rb.success().setData(repaymentSchedule);
}
@Override
public ResultBean<LoanRepaymentDetailsVo> scheduleDetails(String salesOrderSid) {
return loanRepaymentScheduleService.scheduleDetails(salesOrderSid);
}
@Override
public ResultBean<List<LoanRepaymentPlanDetailsExportVo>> exportExcel(List<String> sids) {
return loanRepaymentScheduleService.exportExcel(sids);

11
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@ -4592,4 +4592,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
List<LoanRepaymentPlanDetailsExportVo> vos = baseMapper.selPlansExcel(sids);
return rb.success().setData(vos);
}
public ResultBean<LoanRepaymentDetailsVo> scheduleDetails(String salesOrderSid) {
ResultBean rb = ResultBean.fireFail();
LoanRepaymentDetailsVo vo = new LoanRepaymentDetailsVo();
LoanRepaymentSchedule schedule = baseMapper.selectByContractSid(salesOrderSid);
if (null != schedule) {
}
return rb.success().setData(vo);
}
}

2
yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue

@ -136,6 +136,7 @@ export default {
serviceType: '',
sitemName: '',
manufacturer: '',
type: '1',
orgPath: ''
}
}
@ -218,6 +219,7 @@ export default {
serviceType: '',
sitemName: '',
manufacturer: '',
type: '1',
orgPath: ''
}
}

10
yxt-as-ui/src/views/operation/preregistration/preregistration.vue

@ -41,10 +41,10 @@
<el-form-item label="服务顾问">
<el-input v-model="listQuery.params.waitorName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="预约日期">
<el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<el-form-item label="预约时间">
<el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="listQuery.params.state" clearable placeholder="请选择" filterable>
@ -87,8 +87,8 @@
<el-table-column prop="vehMark" label="车牌号" align="center" width="120" />
<el-table-column prop="vinNo" label="车架号" align="center" width="120" />
<el-table-column prop="mobile" label="联系电话" align="center" width="110" />
<el-table-column prop="reserveStart" label="预约起始时间" align="center" width="130" />
<el-table-column prop="reserveEnd" label="预约截止时间" align="center" width="130" />
<el-table-column prop="reserveStart" label="预约起始时间" align="center" width="150" />
<el-table-column prop="reserveEnd" label="预约截止时间" align="center" width="150" />
<el-table-column prop="waitorName" label="服务顾问" align="center" width="100" />
<el-table-column prop="reserveEquip" label="预约设备" align="center" width="100" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />

82
yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue

@ -29,24 +29,24 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">预约服务顾问</div>
<div class="span-sty"><span class="icon">*</span>预约服务顾问</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.waitorName" placeholder="请选择" @change="waitorChange" clearable filterable>
<el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">预约设备</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.reserveEquip" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">预约日期</div>
<el-col :span="10">
<div class="span-sty"><span class="icon">*</span>预约日期</div>
<el-form-item>
<div class="addinputInfo">
<el-date-picker v-model="formobj.reserveStart" style="width: 140px" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" />
<el-date-picker v-model="formobj.reserveStart" :picker-options="pickerStartData(formobj.reserveEnd)" style="width: 200px" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" />
<span style="padding: 0 4px"></span>
<el-date-picker v-model="formobj.reserveEnd" :picker-options="pickerEndData(formobj.reserveStart)" style="width: 140px" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" />
<el-date-picker v-model="formobj.reserveEnd" :picker-options="pickerEndData(formobj.reserveStart)" style="width: 200px" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" />
</div>
</el-form-item>
</el-col>
@ -94,11 +94,11 @@
<el-popover placement="right" width="600" trigger="click">
<div>
<el-table :data="serviceData" v-loading="serviceLoading" highlight-current-row @current-change="serviceCurrentChange($event, scope.row)">
<el-table-column fixed prop="sitemName" label="项目名称" align="center" width="130" />
<el-table-column prop="sitemCode" label="项目编码" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" min-width="300" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="100" />
<el-table-column fixed prop="sitemName" label="项目名称" align="center" />
<el-table-column prop="sitemCode" label="项目编码" align="center" />
<el-table-column prop="hourPrice" label="工时单价" align="center" />
<el-table-column prop="hours" label="工时数" align="center" />
<el-table-column prop="price" label="销售价" align="center" />
</el-table>
<el-pagination :page.sync="serviceQuery.current" :page-size="serviceQuery.size" layout="total, pager" :total="serviceQuery.total" />
</div>
@ -182,6 +182,7 @@ export default {
total: 0,
params: {
sitemName: '',
type: '0',
orgPath: ''
}
},
@ -209,12 +210,19 @@ export default {
trackLogs: [],
createDeptSid: '',
createDept: '',
customerOrg: ''
customerOrg: '',
userSid: ''
},
rules: {}
}
},
methods: {
//
pickerStartData(newtime) {
return {
disabledDate(time) { return time.getTime() > new Date(newtime) - 1000 * 60 * 60 * 24 }
}
},
//
pickerEndData(newtime) {
return {
@ -237,6 +245,7 @@ export default {
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.formobj.createDept = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.createDeptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date()
@ -256,6 +265,7 @@ export default {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
this.formobj.userSid = window.sessionStorage.getItem('userSid')
}
})
},
@ -360,12 +370,25 @@ export default {
}
},
saveOrUpdate() {
if (this.formobj.waitorName === '') {
this.$message({ showClose: true, type: 'error', message: '预约服务顾问不能为空' })
return
}
if (this.formobj.reserveStart === '' || this.formobj.reserveEnd === '') {
this.$message({ showClose: true, type: 'error', message: '预约时间不能为空' })
return
}
if (this.formobj.customerName === '') {
this.$message({ showClose: true, type: 'error', message: '客户信息不能为空' })
return
}
if (this.formobj.sitemVos.length === 0) {
this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' })
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.sitemVos.length === 0) {
this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' })
return
}
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
@ -381,16 +404,24 @@ export default {
})
},
toService() {
if (this.formobj.waitorName === '') {
this.$message({ showClose: true, type: 'error', message: '预约服务顾问不能为空' })
return
}
if (this.formobj.reserveStart === '' || this.formobj.reserveEnd === '') {
this.$message({ showClose: true, type: 'error', message: '预约时间不能为空' })
return
}
if (this.formobj.customerName === '') {
this.$message({ showClose: true, type: 'error', message: '客户信息不能为空' })
return
}
if (this.formobj.sitemVos.length === 0) {
this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' })
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.sitemVos.length === 0) {
this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' })
return
}
if (this.formobj.sitemVos.length === 0) {
this.$message({ showClose: true, type: 'error', message: '表格不能为空' })
return
}
this.submitdisabled = true
req.convertedRepairOrders(this.formobj).then((res) => {
if (res.success) {
@ -458,7 +489,8 @@ export default {
trackLogs: [],
createDeptSid: '',
createDept: '',
customerOrg: ''
customerOrg: '',
userSid: ''
}
this.submitdisabled = false
this.$emit('doback')

16
yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue

@ -28,11 +28,11 @@
<div class="span-sty">预约服务顾问</div>
<el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">预约设备</div>
<el-form-item><span class="addinputInfo">{{ formobj.reserveEquip }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="10">
<div class="span-sty">预约时间</div>
<el-form-item><span class="addinputInfo">{{ formobj.reserveStart }} {{ formobj.reserveEnd }}</span></el-form-item>
</el-col>
@ -74,9 +74,10 @@
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
<div class="title">跟踪记录</div>
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
<el-table :key="tableKey" :data="formobj.trackLogs" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="name" label="记录内容" align="left" header-align="center" />
<el-table-column prop="remarks" label="记录内容" align="left" header-align="center" />
<el-table-column prop="createTime" label="跟踪时间" align="left" header-align="center" />
</el-table>
</el-form>
</div>
@ -94,7 +95,6 @@ export default {
index: 0,
serviceKey: 0,
tableKey: 1,
list: [],
formobj: {
sid: '',
createBySid: '',
@ -118,7 +118,8 @@ export default {
trackLogs: [],
createDeptSid: '',
createDept: '',
customerOrg: ''
customerOrg: '',
userSid: ''
}
}
},
@ -162,7 +163,8 @@ export default {
trackLogs: [],
createDeptSid: '',
createDept: '',
customerOrg: ''
customerOrg: '',
userSid: ''
}
this.$emit('doback')
}

3
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java

@ -56,6 +56,7 @@ import lombok.Data;
public class AsBusreserveBillDetailsVo implements Vo {
private String sid; // sid
private String userSid;
private String createBySid; // sid
private String orgPath;
private String remarks; // 备注
@ -98,7 +99,7 @@ public class AsBusreserveBillDetailsVo implements Vo {
private String customerOrg; // 客户单位
private List<AsbillSitemVo> sitemVos = new ArrayList<>();
@ApiModelProperty("跟踪记录")
private List<String> trackLogs = new ArrayList<>(); // 跟踪记录
private List<TrackLogsVo> trackLogs = new ArrayList<>(); // 跟踪记录
@ApiModelProperty("跟踪记录")
private String trackLog;
}

3
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java

@ -56,6 +56,7 @@ import lombok.Data;
public class AsBusreserveBillDto implements Dto {
private String sid; // sid
private String userSid;
private String createBySid; // sid
private String orgPath;
private String remarks; // 备注
@ -98,7 +99,7 @@ public class AsBusreserveBillDto implements Dto {
private String customerOrg; // 客户单位
private List<AsbillSitemVo> sitemVos = new ArrayList<>();
@ApiModelProperty("跟踪记录")
private List<String> trackLogs = new ArrayList<>(); // 跟踪记录
private List<TrackLogsVo> trackLogs = new ArrayList<>(); // 跟踪记录
@ApiModelProperty("跟踪记录")
private String trackLog;
}

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java

@ -73,10 +73,10 @@ public class AsBusreserveBillVo implements Vo {
@ApiModelProperty("联系电话")
private String mobile; // 联系电话
@ApiModelProperty("预约时间开始")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date reserveStart; // 预约时间开始
@ApiModelProperty("预约时间截止")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date reserveEnd; // 预约时间截止
@ApiModelProperty("预约服务顾问")
private String waitorName; // 预约服务顾问

14
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/TrackLogsVo.java

@ -0,0 +1,14 @@
package com.yxt.anrui.as.api.asbusreservebill;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/5/11 17:28
*/
@Data
public class TrackLogsVo {
private String remarks;
private String createTime;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java

@ -57,4 +57,6 @@ public class AsServiceItemQuery implements Query {
@ApiModelProperty("全路径")
private String orgPath;
private String type; //0查预约项目 1查所有
}

10
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java

@ -55,13 +55,15 @@ public interface AsBusreserveBillMapper extends BaseMapper<AsBusreserveBill> {
//@Update("update as_busreserve_bill set name=#{msg} where id=#{id}")
//IPage<AsBusreserveBillVo> voPage(IPage<AsBusreserveBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusreserveBill> qw);
IPage<AsBusreserveBillVo> selectPageVo(IPage<AsBusreserveBill> page, @Param(Constants.WRAPPER) Wrapper<AsBusreserveBill> qw);
List<AsBusreserveBillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsBusreserveBill> qw);
@Select("select * from as_busreserve_bill")
List<AsBusreserveBillVo> selectListVo();
int selectNum(String bill);
}
int selectBySid(String join);
}

10
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml

@ -6,7 +6,7 @@
<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
SELECT * FROM as_busreserve_bill <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
SELECT * FROM as_busreserve_bill <where> ${ew.sqlSegment} </where>
</select>
@ -15,4 +15,10 @@
from as_busreserve_bill
where billNo LIKE concat(#{bill}, '%')
</select>
</mapper>
<select id="selectBySid" resultType="java.lang.Integer">
SELECT COUNT(*)
FROM as_busreserve_bill
WHERE `state` != 1
and find_in_set(sid, #{list})
</select>
</mapper>

6
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java

@ -35,6 +35,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -85,6 +86,11 @@ public class AsBusreserveBillRest {
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有不是未完成的
int count = asBusreserveBillService.selectBySid(StringUtils.join(sids, ","));
if (count > 0) {
return rb.setMsg("请选择未完成的数据进行删除!");
}
asBusreserveBillService.delBySids(sids);
for (String sid : sids) {
asBusreserveBillSitemService.delByMainSid(sid);

15
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@ -312,13 +312,16 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
}
List<AsBusreserveBillTrack> asBusreserveBillTracks = asBusreserveBillTrackService.fetchByMainSid(sid);
if (!asBusreserveBillTracks.isEmpty()) {
List<String> remarks = new ArrayList<>();
List<TrackLogsVo> list = new ArrayList<>();
for (AsBusreserveBillTrack asBusreserveBillTrack : asBusreserveBillTracks) {
TrackLogsVo logsVo = new TrackLogsVo();
if (StringUtils.isNotBlank(asBusreserveBillTrack.getRemarks())) {
remarks.add(asBusreserveBillTrack.getRemarks());
logsVo.setRemarks(asBusreserveBillTrack.getRemarks());
}
logsVo.setCreateTime(sdf.format(asBusreserveBillTrack.getCreateTime()));
list.add(logsVo);
}
vo.setTrackLogs(remarks);
vo.setTrackLogs(list);
}
}
return vo;
@ -340,6 +343,8 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
AsBusreserveBillTrack billTrack = new AsBusreserveBillTrack();
billTrack.setRemarks(dto.getTrackLog());
billTrack.setBillSid(dto.getSid());
billTrack.setCreateBySid(dto.getUserSid());
billTrack.setUpdateBySid(dto.getUserSid());
asBusreserveBillTrackService.insert(billTrack);
}
}
@ -413,4 +418,8 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
baseMapper.updateById(bill);
}
}
public int selectBySid(String join) {
return baseMapper.selectBySid(join);
}
}

6
yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java

@ -49,6 +49,12 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
if (StringUtils.isNotBlank(query.getManufacturer())) {
qw.like("manufacturer", query.getManufacturer());
}
if (StringUtils.isNotBlank(query.getType())) {
if (query.getType().equals("0")) {
//查询预约项目
qw.eq("isReserve",1);
}
}
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
if (orgSidByPath.getSuccess()) {
qw.eq("useOrgSid", orgSidByPath.getData());

8
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java

@ -50,7 +50,13 @@ public class BaseGoodsBrandRest {
public ResultBean delete(@PathVariable("sid") String sid) {
return baseBrandInfoService.delete(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseBrandInfoService.delAll(sids);
return rb.success();
}
@ApiOperation("更改可用状态")
@GetMapping("/updateIsEnable/{sid}/{isEnable}")

13
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java

@ -51,11 +51,22 @@ public class BaseGoodsTypeRest {
public ResultBean delete(@PathVariable("sid") String sid) {
return baseGoodsTypeService.delete(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseGoodsTypeService.delAll(sids);
return rb.success();
}
@ApiOperation("更改可用状态")
@GetMapping("/updateIsEnable/{sid}/{isEnable}")
public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) {
return baseGoodsTypeService.updateIsEnable(sid,isEnable);
}
@ApiOperation("更改商品是否一品一码")
@GetMapping("/updateIsGoodsID/{sid}/{state}")
public ResultBean updateIsGoodsID(@PathVariable("sid") String sid,@PathVariable("state")String state) {
return baseGoodsTypeService.updateProductCode(sid,state);
}
}

8
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java

@ -51,7 +51,13 @@ public class BaseGoodsUnitRest {
public ResultBean delete(@PathVariable("sid") String sid) {
return baseGoodsUnitService.delete(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseGoodsUnitService.delAll(sids);
return rb.success();
}
@ApiOperation("更改可用状态")
@GetMapping("/updateIsEnable/{sid}/{isEnable}")

8
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java

@ -53,7 +53,13 @@ public class BaseManufacturerRest {
return baseManufacturerService.delete(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseManufacturerService.delAll(sids);
return rb.success();
}
@ApiOperation("更改可用状态")
@GetMapping("/updateIsEnable/{sid}/{isEnable}")
public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") String isEnable) {

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java

@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author wangpengfei
* @date 2024/2/26 13:40
*/
@Mapper
public interface BaseBrandInfoMapper extends BaseMapper<BaseBrandInfo> {
int updateBySidIsDelete(List<String> list);
IPage<BaseBrandInfoVo> listPage(IPage<BaseBrandInfo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseBrandInfo> qw);
}

8
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml

@ -12,4 +12,12 @@
${ew.sqlSegment}
</where>
</select>
<update id="updateBySidIsDelete">
UPDATE base_brand_info
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

8
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java

@ -15,9 +15,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@ -36,6 +38,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
if(StringUtils.isNotBlank(query.getName())){
qw.like("brandName",query.getName());
}
qw.ne("isDelete","1");
IPage<BaseBrandInfo> page = PagerUtil.queryToPage(pq);
IPage<BaseBrandInfoVo> pagging = baseMapper.listPage(page, qw);
PagerVo<BaseBrandInfoVo> p = PagerUtil.pageToVo(pagging, null);
@ -52,7 +55,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
}
public ResultBean<List<BaseBrandInfo>> listAll() {
ResultBean rb = ResultBean.fireFail();
List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1));
List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1).ne("isDelete","1"));
return rb.success().setData(pagging);
}
public ResultBean<String> saveOrUpdate(BaseBrandInfoDto dto) {
@ -114,6 +117,9 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
}
return rb.success().setMsg("成功");
}
public void delAll(String[] sids) {
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
ResultBean rb = ResultBean.fireFail();
BaseBrandInfo wmsGoodsBrand = fetchBySid(sid);

5
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@ -94,7 +94,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
BaseGoodsSpu wmsGoods = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsGoods);
wmsGoods.setModifyTime(new Date());
wmsGoods.setGoodsPY(PinYinUtils.getPinYinName(wmsGoods.getGoodsName()));;
// wmsGoods.setGoodsPY(PinYinUtils.getPinYinName(wmsGoods.getGoodsName()));;
wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));;
baseMapper.updateById(wmsGoods);
//spu详情
dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid());
@ -113,6 +114,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
sid = wmsGoods.getSid();
BeanUtil.copyProperties(dto, wmsGoods);
wmsGoods.setCreateTime(new DateTime());
wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));
baseMapper.insert(wmsGoods);
//spu详情
dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid());
@ -126,6 +128,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
return rb.success().setMsg("成功");
}
public ResultBean<BaseGoodsSpuVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseGoodsSpuVo vo = baseMapper.initialization(sid);

1
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java

@ -19,4 +19,5 @@ public class BaseGoodsType extends BaseEntity {
private String sortNo;//排序
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String outStockRule;//出库规则
}

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java

@ -30,4 +30,6 @@ public class BaseGoodsTypeDto implements Dto {
private String createOrgSid;//创建组织sid
private String pName;//创建组织sid
private String sids;//父级sid
private String outStockRule;//出库规则
}

3
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author wangpengfei
* @date 2024/2/26 13:40
@ -14,4 +16,5 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface BaseGoodsTypeMapper extends BaseMapper<BaseGoodsType> {
IPage<BaseGoodsTypeVo> listPage(IPage<BaseGoodsType> page, @Param(Constants.WRAPPER) QueryWrapper<BaseGoodsType> qw);
int updateBySidIsDelete(List<String> list);
}

8
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml

@ -12,4 +12,12 @@
${ew.sqlSegment}
</where>
</select>
<update id="updateBySidIsDelete">
UPDATE base_goods_type
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

5
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java

@ -9,5 +9,8 @@ import lombok.Data;
*/
@Data
public class BaseGoodsTypeQuery implements Query {
private String name;
private String name;//名字
private String code;//编码
private String goodID;//是否一品一码(goodID),0否,1是
private String outStockRule;//出库规则(先进先出0、先进后出1、保质期优先2)
}

45
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java

@ -13,8 +13,10 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@ -31,7 +33,17 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
if(StringUtils.isNotBlank(query.getName())){
qw.like("goodsTypeName",query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("goodsTypeCode",query.getCode());
}
if(StringUtils.isNotBlank(query.getGoodID())){
qw.eq("isGoodsID",query.getGoodID());
}
if(StringUtils.isNotBlank(query.getOutStockRule())){
qw.eq("outStockRule",query.getOutStockRule());
}
qw.ne("isDelete","1");
qw.orderByDesc("sortNo");
IPage<BaseGoodsType> page = PagerUtil.queryToPage(pq);
IPage<BaseGoodsTypeVo> pagging = baseMapper.listPage(page, qw);
PagerVo<BaseGoodsTypeVo> p = PagerUtil.pageToVo(pagging, null);
@ -39,14 +51,18 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
for (BaseGoodsTypeVo record : records) {
if(StringUtils.isNotBlank(record.getPSid())){
BaseGoodsType wmsGoodsType1 = fetchBySid(record.getPSid());
record.setPName(wmsGoodsType1.getGoodsTypeName());
if(wmsGoodsType1!=null){
record.setPName(wmsGoodsType1.getGoodsTypeName());
}
record.setSids(record.getPSid());
}
}
return rb.success().setData(p);
} public ResultBean<List<BaseGoodsType>> listAll() {
}
public ResultBean<List<BaseGoodsType>> listAll() {
ResultBean rb = ResultBean.fireFail();
List<BaseGoodsType> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsType>().eq("isEnable",1));
List<BaseGoodsType> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsType>().eq("isEnable",1)
.ne("isDelete","1"));
return rb.success().setData(pagging);
}
@ -94,6 +110,15 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
vo.setPName(wmsGoodsType1.getGoodsTypeName());
}
vo.setSids(wmsGoodsType.getPSid());
if(StringUtils.isNotBlank(wmsGoodsType.getOutStockRule())){
if(wmsGoodsType.getOutStockRule().equals("0")){
vo.setOutStockRuleValue("先进先出");
} else if (wmsGoodsType.getOutStockRule().equals("1")) {
vo.setOutStockRuleValue("先进后出");
}else if(wmsGoodsType.getOutStockRule().equals("2")){
vo.setOutStockRuleValue("保质期优先");
}
}
}
return rb.success().setData(vo);
}
@ -108,6 +133,9 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
}
return rb.success();
}
public void delAll(String[] sids) {
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
ResultBean rb = ResultBean.fireFail();
BaseGoodsType wmsGoodsType = fetchBySid(sid);
@ -117,4 +145,13 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
}
return rb.success().setMsg("成功");
}
public ResultBean updateProductCode(String sid,String state) {
ResultBean rb = ResultBean.fireFail();
BaseGoodsType wmsGoodsType = fetchBySid(sid);
if (null != wmsGoodsType) {
wmsGoodsType.setIsGoodsID(state);
baseMapper.updateById(wmsGoodsType);
}
return rb.success().setMsg("成功");
}
}

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java

@ -34,5 +34,7 @@ public class BaseGoodsTypeVo implements Vo {
private String sortNo;//排序
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String outStockRule;//出库规则
private String sids;//创建组织sid
private String outStockRuleValue;//出库规则
}

3
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.java

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author wangpengfei
* @date 2024/2/26 13:40
@ -14,4 +16,5 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface BaseGoodsUnitMapper extends BaseMapper<BaseGoodsUnit> {
IPage<BaseGoodsUnitVo> listPage(IPage<BaseGoodsUnit> page, @Param(Constants.WRAPPER) QueryWrapper<BaseGoodsUnit> qw);
int updateBySidIsDelete(List<String> list);
}

8
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml

@ -12,4 +12,12 @@
${ew.sqlSegment}
</where>
</select>
<update id="updateBySidIsDelete">
UPDATE base_goods_unit
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

6
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java

@ -13,8 +13,10 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@ -95,6 +97,10 @@ public class BaseGoodsUnitService extends MybatisBaseService<BaseGoodsUnitMapper
}
return rb.success();
}
public void delAll(String[] sids) {
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
ResultBean rb = ResultBean.fireFail();
BaseGoodsUnit wmsGoodsType = fetchBySid(sid);

1
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.java

@ -18,4 +18,5 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
IPage<BaseManufacturerVo> listPage(IPage<BaseManufacturer> page, @Param(Constants.WRAPPER) QueryWrapper<BaseManufacturer> qw);
List<BaseManufacturerVo> getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid);
int updateBySidIsDelete(List<String> list);
}

8
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml

@ -17,4 +17,12 @@
from base_manufacturer
where useOrgSid = #{useOrgSid}
</select>
<update id="updateBySidIsDelete">
UPDATE base_manufacturer
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

13
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java

@ -13,8 +13,10 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@ -31,7 +33,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
if(StringUtils.isNotBlank(query.getName())){
qw.like("manufacturerName",query.getName());
}
qw.ne("isDelete","1");
qw.orderByDesc("sortNo");
IPage<BaseManufacturer> page = PagerUtil.queryToPage(pq);
IPage<BaseManufacturerVo> pagging = baseMapper.listPage(page, qw);
PagerVo<BaseManufacturerVo> p = PagerUtil.pageToVo(pagging, null);
@ -40,7 +43,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
}
public ResultBean<List<BaseManufacturer>> listAll() {
ResultBean rb = ResultBean.fireFail();
List<BaseManufacturer> pagging = baseMapper.selectList(new QueryWrapper<BaseManufacturer>().eq("isEnable",1));
List<BaseManufacturer> pagging = baseMapper.selectList(new QueryWrapper<BaseManufacturer>().eq("isEnable",1)
.ne("isDelete","1"));
return rb.success().setData(pagging);
}
@ -93,6 +97,11 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
}
return rb.success();
}
public void delAll(String[] sids) {
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
ResultBean rb = ResultBean.fireFail();
BaseManufacturer wmsManufacturer = fetchBySid(sid);

17
yxt-base-biz/src/main/java/com/yxt/base/utils/PinYinUtils.java

@ -139,7 +139,22 @@ public class PinYinUtils {
}
return null;
}
/**
* 缩写
* @param args
*/
public static String sx(String hz) {
char [] nameArray = hz.toCharArray();
String b="";
for (int i = 0; i < nameArray.length; i++) {
if (Character.toString(nameArray[i]).matches("^[\u4e00-\u9fa5]+$")) {
b=b+PinYinUtils.getCharDuoPinYinChar(String.valueOf(nameArray[i]));
}else{
b=b+String.valueOf(nameArray[i]);
}
}
return b;
}
/**
* 返回字符串的拼音的首字母
* @param str

8
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java

@ -51,7 +51,13 @@ public class WmsWarehouseAreaRest {
public ResultBean delete(@PathVariable("sid") String sid) {
return wmsWarehouseAreaService.delete(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
wmsWarehouseAreaService.delAll(sids);
return rb.success();
}
@ApiOperation("更改可用状态")
@GetMapping("/updateIsEnable/{sid}/{isEnable}")

8
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java

@ -52,7 +52,13 @@ public class WmsWarehouseAreaTypeRest {
public ResultBean delete(@PathVariable("sid") String sid) {
return wmsWarehouseAreaTypeService.delete(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
wmsWarehouseAreaTypeService.delAll(sids);
return rb.success();
}
@ApiOperation("更改可用状态")
@GetMapping("/updateIsEnable/{sid}/{isEnable}")

8
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java

@ -53,7 +53,13 @@ public class WmsWarehouseInfoRest {
return wmsWarehouseService.delete(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
wmsWarehouseService.delAll(sids);
return rb.success();
}
@ApiOperation("更改可用状态")
@GetMapping("/updateStatus/{sid}/{state}")
public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("state")String state) {

8
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java

@ -52,7 +52,13 @@ public class WmsWarehouseRackRest {
public ResultBean delete(@PathVariable("sid") String sid) {
return wmsWarehouseRackService.delete(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
wmsWarehouseRackService.delAll(sids);
return rb.success();
}
@ApiOperation("更改可用状态")
@GetMapping("/updateIsEnable/{sid}/{isEnable}")

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java

@ -18,7 +18,7 @@ import java.util.List;
public interface WmsWarehouseAreaMapper extends BaseMapper<WmsWarehouseArea> {
IPage<WmsWarehouseAreaVo> listPage(IPage<WmsWarehouseArea> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseArea> qw);
WmsWarehouseAreaVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}")
List<WmsWarehouseAreaAllVo> selectAll(String ckSid);
}

9
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml

@ -23,5 +23,12 @@
where a.sid =#{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE wms_warehouse_area
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

5
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java

@ -9,5 +9,8 @@ import lombok.Data;
*/
@Data
public class WmsWarehouseAreaQuery implements Query {
private String name;
private String name;//名字
private String code;//编码
private String warehouseSid;//仓库
private String areaTypeSid;//库区类型
}

21
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java

@ -12,8 +12,10 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@ -30,7 +32,16 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
if(StringUtils.isNotBlank(query.getName())){
qw.like("areaName",query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("areaCode",query.getCode());
}
if(StringUtils.isNotBlank(query.getWarehouseSid())){
qw.eq("b.sid",query.getWarehouseSid());
}
if(StringUtils.isNotBlank(query.getAreaTypeSid())){
qw.eq("c.sid",query.getAreaTypeSid());
}
qw.ne("a.isDelete","1");
IPage<WmsWarehouseArea> page = PagerUtil.queryToPage(pq);
IPage<WmsWarehouseAreaVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsWarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
@ -39,7 +50,8 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
}
public ResultBean<WmsWarehouseAreaVo> getAllType() {
ResultBean rb = ResultBean.fireFail();
List<WmsWarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseArea>().eq("isEnable",1));
List<WmsWarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseArea>().eq("isEnable",1)
.ne("isDelete","1"));
return rb.success().setData(pagging);
}
@ -77,6 +89,11 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
}
return rb.success();
}
public void delAll(String[] sids) {
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseArea wmsWarehouseArea = fetchBySid(sid);

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author wangpengfei
* @date 2024/2/26 13:40
@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Param;
public interface WmsWarehouseAreaTypeMapper extends BaseMapper<WmsWarehouseAreaType> {
IPage<WmsWarehouseAreaTypeVo> listPage(IPage<WmsWarehouseAreaType> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseAreaType> qw);
WmsWarehouseAreaTypeVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
}

9
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml

@ -18,5 +18,12 @@
from wms_warehouse_area_type a
where a.sid =#{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE wms_warehouse_area_type
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

12
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java

@ -12,8 +12,10 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@ -28,9 +30,9 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouse
WmsWarehouseAreaTypeQuery query = pq.getParams();
QueryWrapper<WmsWarehouseAreaType> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getName())){
qw.like("areaName",query.getName());
qw.like("warehouseAreaTypeName",query.getName());
}
qw.ne("isDelete","1");
IPage<WmsWarehouseAreaType> page = PagerUtil.queryToPage(pq);
IPage<WmsWarehouseAreaTypeVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsWarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
@ -39,7 +41,8 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouse
}
public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
ResultBean rb = ResultBean.fireFail();
List<WmsWarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseAreaType>().eq("isEnable",1));
List<WmsWarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseAreaType>().eq("isEnable",1)
.ne("isDelete","1"));
return rb.success().setData(pagging);
}
@ -77,6 +80,9 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouse
}
return rb.success();
}
public void delAll(String[] sids) {
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(sid);

13
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java

@ -24,18 +24,7 @@ public class WmsWarehouseInfo extends BaseEntity {
private String warehouseTypeValue;//仓库类型value
private String usageStatus;//使用状态,0停用 1正常
private String squareMeter;//平方米
private String sortNo;//创建组织sid
private String sortNo;//排序
private String useOrgSid;//创建组织sid
private String createOrgSid;//创建组织sid
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java

@ -8,6 +8,7 @@ import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -19,6 +20,7 @@ import java.util.List;
public interface WmsWarehouseInfoMapper extends BaseMapper<WmsWarehouseInfo> {
IPage<WmsWarehouseInfoVo> listPage(IPage<WmsWarehouseInfo> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseInfo> qw);
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_info")
List<WmsWarehouseAreaAllVo> selectAll();
}

9
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml

@ -12,4 +12,13 @@
${ew.sqlSegment}
</where>
</select>
<update id="updateBySidIsDelete">
UPDATE wms_warehouse_info
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java

@ -10,4 +10,6 @@ import lombok.Data;
@Data
public class WmsWarehouseInfoQuery implements Query {
private String name;
private String code;
private String address;
}

15
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@ -19,8 +19,10 @@ import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@ -39,7 +41,14 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
if(StringUtils.isNotBlank(query.getName())){
qw.like("warehouseName",query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("warehouseCode",query.getCode());
}
if(StringUtils.isNotBlank(query.getAddress())){
qw.like("address",query.getAddress());
}
qw.ne("isDelete",1);
qw.orderByDesc("sortNo");
IPage<WmsWarehouseInfo> page = PagerUtil.queryToPage(pq);
IPage<WmsWarehouseInfoVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsWarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
@ -114,6 +123,10 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
}
return rb.success();
}
public void delAll(String[] sids) {
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseInfo wmsWarehouse = fetchBySid(sid);

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java

@ -8,6 +8,8 @@ import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author wangpengfei
* @date 2024/2/26 13:40
@ -16,4 +18,5 @@ import org.apache.ibatis.annotations.Param;
public interface WmsWarehouseRackMapper extends BaseMapper<WmsWarehouseRack> {
IPage<WmsWarehouseRackVo> listPage(IPage<WmsWarehouseRack> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseRack> qw);
WmsWarehouseRackVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
}

9
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml

@ -22,4 +22,13 @@
left join wms_warehouse_info c on c.sid = a.warehouseSid
where a.sid =#{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE wms_warehouse_rack
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

5
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java

@ -9,5 +9,8 @@ import lombok.Data;
*/
@Data
public class WmsWarehouseRackQuery implements Query {
private String name;
private String name;//名字
private String code;//编码
private String warehouseSid;//仓库
private String areaTypeSid;//库区类型
}

20
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java

@ -13,8 +13,10 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author wangpengfei
@ -31,7 +33,16 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
if(StringUtils.isNotBlank(query.getName())){
qw.like("rackName",query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("rackCode",query.getCode());
}
if(StringUtils.isNotBlank(query.getAreaTypeSid())){
qw.eq("b.sid",query.getAreaTypeSid());
}
if(StringUtils.isNotBlank(query.getWarehouseSid())){
qw.eq("c.sid",query.getWarehouseSid());
}
qw.ne("a.isDelete","1");
IPage<WmsWarehouseRack> page = PagerUtil.queryToPage(pq);
IPage<WmsWarehouseRackVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsWarehouseRackVo> p = PagerUtil.pageToVo(pagging, null);
@ -40,7 +51,8 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
}
public ResultBean<WmsWarehouseRackVo> getAllType() {
ResultBean rb = ResultBean.fireFail();
List<WmsWarehouseRack> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseRack>().eq("isEnable",1));
List<WmsWarehouseRack> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseRack>().eq("isEnable",1)
.ne("isDelete","1"));
return rb.success().setData(pagging);
}
@ -78,6 +90,10 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
}
return rb.success();
}
public void delAll(String[] sids) {
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseRack wmsWarehouseRack = fetchBySid(sid);

Loading…
Cancel
Save