diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/DetailsListVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/DetailsListVo.java new file mode 100644 index 0000000000..2c5f0208a8 --- /dev/null +++ b/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; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentDetailsVo.java new file mode 100644 index 0000000000..795b78adff --- /dev/null +++ b/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 vinList = new ArrayList<>(); + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java index 23033a17cb..ea19f8602d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java +++ b/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 fetchBySid(@RequestParam("sid") String sid); + @ApiOperation("查看详情页") + @GetMapping("/scheduleDetails") + @ResponseBody + public ResultBean scheduleDetails(@RequestParam("salesOrderSid") String salesOrderSid); + @PostMapping("/exportExcel") @ApiOperation(value = "还款计划表导出") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java index 33f3d71490..2caa227850 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java +++ b/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 scheduleDetails(String salesOrderSid) { + return null; + } + @Override public ResultBean exportExcel(List sids) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java index 549fbe283c..d109a4ac50 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java +++ b/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 scheduleDetails(String salesOrderSid) { + return loanRepaymentScheduleService.scheduleDetails(salesOrderSid); + } + @Override public ResultBean> exportExcel(List sids) { return loanRepaymentScheduleService.exportExcel(sids); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index d43364dc38..a9873a2979 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/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 vos = baseMapper.selPlansExcel(sids); return rb.success().setData(vos); } + + public ResultBean scheduleDetails(String salesOrderSid) { + ResultBean rb = ResultBean.fireFail(); + LoanRepaymentDetailsVo vo = new LoanRepaymentDetailsVo(); + LoanRepaymentSchedule schedule = baseMapper.selectByContractSid(salesOrderSid); + if (null != schedule) { + + + } + return rb.success().setData(vo); + } } diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue index 8fff6677b6..51a537ace9 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue +++ b/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: '' } } diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistration.vue b/yxt-as-ui/src/views/operation/preregistration/preregistration.vue index 8d6e5a4dbf..3c45793f68 100644 --- a/yxt-as-ui/src/views/operation/preregistration/preregistration.vue +++ b/yxt-as-ui/src/views/operation/preregistration/preregistration.vue @@ -41,10 +41,10 @@ - - + + 至 - + @@ -87,8 +87,8 @@ - - + + diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue index 8f905dfae0..2b535c8c13 100644 --- a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue +++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue @@ -29,24 +29,24 @@ -
预约服务顾问
+
*预约服务顾问
 - +
预约设备
 - -
预约日期
+ +
*预约日期
- + 至 - +
@@ -94,11 +94,11 @@
- - - - - + + + + +
@@ -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') diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue index 8ed6eed384..c8ecc55c50 100644 --- a/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue +++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue @@ -28,11 +28,11 @@
预约服务顾问
{{ formobj.waitorName }} - +
预约设备
{{ formobj.reserveEquip }} - +
预约时间
{{ formobj.reserveStart }} 至 {{ formobj.reserveEnd }} @@ -74,9 +74,10 @@
跟踪记录
- + - + + @@ -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') } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java index 05bc38d5be..ac0dc75c7e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java +++ b/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 sitemVos = new ArrayList<>(); @ApiModelProperty("跟踪记录") - private List trackLogs = new ArrayList<>(); // 跟踪记录 + private List trackLogs = new ArrayList<>(); // 跟踪记录 @ApiModelProperty("跟踪记录") private String trackLog; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java index 42dc1fa5e0..04cd7dd1f8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java +++ b/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 sitemVos = new ArrayList<>(); @ApiModelProperty("跟踪记录") - private List trackLogs = new ArrayList<>(); // 跟踪记录 + private List trackLogs = new ArrayList<>(); // 跟踪记录 @ApiModelProperty("跟踪记录") private String trackLog; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java index b627e65dc6..1d014cf290 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java +++ b/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; // 预约服务顾问 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/TrackLogsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/TrackLogsVo.java new file mode 100644 index 0000000000..4956dcace4 --- /dev/null +++ b/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; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java index 1b4acc0e12..bda148a8dd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java +++ b/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查所有 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java index 36df67fd02..e23797a64a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java @@ -55,13 +55,15 @@ public interface AsBusreserveBillMapper extends BaseMapper { //@Update("update as_busreserve_bill set name=#{msg} where id=#{id}") //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - + @Select("select * from as_busreserve_bill") List selectListVo(); int selectNum(String bill); -} \ No newline at end of file + + int selectBySid(String join); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml index b937e69acb..329392d9dd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml @@ -6,7 +6,7 @@ - + @@ -15,4 +15,10 @@ from as_busreserve_bill where billNo LIKE concat(#{bill}, '%') - \ No newline at end of file + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java index f7258efbb4..e918bf3330 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java +++ b/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); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java index c76468eaa5..1d82a786c4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java @@ -312,13 +312,16 @@ public class AsBusreserveBillService extends MybatisBaseService asBusreserveBillTracks = asBusreserveBillTrackService.fetchByMainSid(sid); if (!asBusreserveBillTracks.isEmpty()) { - List remarks = new ArrayList<>(); + List 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 orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()); if (orgSidByPath.getSuccess()) { qw.eq("useOrgSid", orgSidByPath.getData()); diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java index cea7df21a8..3738b7c2d3 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java +++ b/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}") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java index ad039f078c..0b224a707a 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java +++ b/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); + } } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java index fa6a121041..7df073896b 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java +++ b/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}") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java index 4ed52019da..0c2dfc1734 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java +++ b/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) { diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java index 906ca2eb7f..408acd3ade 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java +++ b/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 { - + int updateBySidIsDelete(List list); IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml index 798f066dc7..e39eb2c32c 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml @@ -12,4 +12,12 @@ ${ew.sqlSegment} + + UPDATE base_brand_info + SET isDelete=1 + where sid in + + #{item} + + \ No newline at end of file diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java index b550a1be61..c7bbfec8e0 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java +++ b/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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -52,7 +55,7 @@ public class BaseBrandInfoService extends MybatisBaseService> listAll() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1")); return rb.success().setData(pagging); } public ResultBean saveOrUpdate(BaseBrandInfoDto dto) { @@ -114,6 +117,9 @@ public class BaseBrandInfoService extends MybatisBaseService initialization(String sid) { ResultBean rb = ResultBean.fireFail(); BaseGoodsSpuVo vo = baseMapper.initialization(sid); diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java index 5d389be9fb..b047e66a58 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java +++ b/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;//出库规则 } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java index 2bdf4964c8..b68f2692c6 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java +++ b/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;//出库规则 + } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java index a71619789f..58abddd5b3 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java +++ b/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 { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + int updateBySidIsDelete(List list); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml index 11ac8aa0a8..73621a6647 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml @@ -12,4 +12,12 @@ ${ew.sqlSegment} + + UPDATE base_goods_type + SET isDelete=1 + where sid in + + #{item} + + \ No newline at end of file diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java index 3e3b90f26b..130d34e0c3 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java +++ b/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） } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java index 3fb41b9b9c..a3bcd6feea 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java +++ b/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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -39,14 +51,18 @@ public class BaseGoodsTypeService extends MybatisBaseService> listAll() { + } + public ResultBean> listAll() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1")); return rb.success().setData(pagging); } @@ -94,6 +110,15 @@ public class BaseGoodsTypeService extends MybatisBaseService { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + int updateBySidIsDelete(List list); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml index e2e9a98925..e0deacbdd0 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml @@ -12,4 +12,12 @@ ${ew.sqlSegment} + + UPDATE base_goods_unit + SET isDelete=1 + where sid in + + #{item} + + \ No newline at end of file diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java index 5abc556c4a..1606f2035d 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java +++ b/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 { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid); + int updateBySidIsDelete(List list); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml index 2f128ae125..416ed59e23 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml @@ -17,4 +17,12 @@ from base_manufacturer where useOrgSid = #{useOrgSid} + + UPDATE base_manufacturer + SET isDelete=1 + where sid in + + #{item} + + \ No newline at end of file diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java index c27e6d8469..ffdfbb3e50 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java +++ b/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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -40,7 +43,8 @@ public class BaseManufacturerService extends MybatisBaseService> listAll() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1")); return rb.success().setData(pagging); } @@ -93,6 +97,11 @@ public class BaseManufacturerService extends MybatisBaseService { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); WmsWarehouseAreaVo initialization (@Param("sid") String sid); - + int updateBySidIsDelete(List list); @Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}") List selectAll(String ckSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml index 4cdd80de77..d9945e3c2d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml @@ -23,5 +23,12 @@ where a.sid =#{sid} - + + UPDATE wms_warehouse_area + SET isDelete=1 + where sid in + + #{item} + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java index dc95bb8ee3..ad5920921a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java +++ b/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;//库区类型 } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java index d357cde69d..7dcc7b1afb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java +++ b/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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -39,7 +50,8 @@ public class WmsWarehouseAreaService extends MybatisBaseService getAllType() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1")); return rb.success().setData(pagging); } @@ -77,6 +89,11 @@ public class WmsWarehouseAreaService extends MybatisBaseService { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); WmsWarehouseAreaTypeVo initialization (@Param("sid") String sid); + int updateBySidIsDelete(List list); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml index c9a6c7995f..d8745906a2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml +++ b/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} - + + UPDATE wms_warehouse_area_type + SET isDelete=1 + where sid in + + #{item} + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java index f8f4d52bf6..9e0fe8c749 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java +++ b/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 qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ - qw.like("areaName",query.getName()); + qw.like("warehouseAreaTypeName",query.getName()); } - + qw.ne("isDelete","1"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -39,7 +41,8 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService listAll() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1")); return rb.success().setData(pagging); } @@ -77,6 +80,9 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + int updateBySidIsDelete(List list); @Select("select * from wms_warehouse_info") List selectAll(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml index 69e01fe07d..25dc91b176 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml @@ -12,4 +12,13 @@ ${ew.sqlSegment} + + UPDATE wms_warehouse_info + SET isDelete=1 + where sid in + + #{item} + + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java index eb0b237654..0096dfb491 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java +++ b/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; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java index 45b12c5079..cd1932c11b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java +++ b/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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -114,6 +123,10 @@ public class WmsWarehouseInfoService extends MybatisBaseService { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); WmsWarehouseRackVo initialization (@Param("sid") String sid); + int updateBySidIsDelete(List list); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml index 13f5fbdd00..64fa0a6c9d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml +++ b/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} + + UPDATE wms_warehouse_rack + SET isDelete=1 + where sid in + + #{item} + + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java index 4ee91bcea1..fe8876638d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java +++ b/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;//库区类型 } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java index 608cdd68cd..770fe6757f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java +++ b/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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -40,7 +51,8 @@ public class WmsWarehouseRackService extends MybatisBaseService getAllType() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1")); return rb.success().setData(pagging); } @@ -78,6 +90,10 @@ public class WmsWarehouseRackService extends MybatisBaseService