diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java index d4041077..a7a3a323 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java @@ -65,9 +65,15 @@ public interface DictTypeConstants { String CARRIER_TYPE = "carrier_type";//承运商类型 String INVENTORY_STATUS = "inventory_status";//库存状态 String REQUEST_STATUS = "request_status";//请求状态 + String PLAN_STATUS = "plan_status";//计划状态 String PURCHASE_RETURN_REASON = "purchase_return_reason";//原因 String TRANSFER_MODE = "transfer_mode";//运输方式 String FAILED_REASON = "failed_reason";//采购收货不合格原因 + String INSPECT_TYPE = "inspect_type";//检验类型 + String NEXT_ACTION = "next_action";//下一步检验动作 + String SAMPLE_METHOD = "sample_method";//抽检方式 + String INSPECT_FAILED_REASON = "inspect_failed_reason";//不合格原因 + String INSPECT_RESULT = "inspect_result";//检验结果 } diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index 30d9d195..a23cd5f5 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -424,10 +424,15 @@ public interface ErrorCodeConstants { ErrorCode PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_073_002, "采购收货任务状态错误"); ErrorCode PURCHASERECEIPT_REQUEST_STATUS_NOT_NEW = new ErrorCode(1_000_073_003, "采购收货不是新增状态"); ErrorCode PURCHASERECEIPT_REQUEST_JOB_EXISTS = new ErrorCode(1_000_073_004, "采购收货存在采购收货任务单"); - ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_073_004, "采购收货状态不支持关闭"); + ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_073_005, "采购收货状态不支持关闭"); + ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_073_006, "采购收货状态不支持提交"); + ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_073_007, "采购收货状态不支持审批同意"); + ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_073_008, "采购收货状态不支持处理"); + ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_073_009, "采购收货状态不支持审批拒绝"); //采购收货任务子ErrorCode ErrorCode PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_074_000, "采购收货记录主不存在"); ErrorCode PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_074_001, "采购收货记录子不存在"); + ErrorCode PURCHASERECEIPT_RECORD_DETAIL_EXCEPTION = new ErrorCode(1_000_074_002, "采购收货记录明细问题【{}】"); //采购退货申请主ErrorCode ErrorCode PURCHASERETURN_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_075_000, "采购退货申请主不存在"); //采购退货申请子ErrorCode @@ -444,10 +449,16 @@ public interface ErrorCodeConstants { //采购退货记录子ErrorCode ErrorCode PURCHASERETURN_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_077_001, "采购退货记录子不存在"); //检验申请主ErrorCode - ErrorCode INSPECT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_078_000, "检验申请主不存在"); + ErrorCode INSPECT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_078_000, "到货检验申请主不存在"); //检验申请子ErrorCode - ErrorCode INSPECT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_078_001, "检验申请子不存在"); - ErrorCode INSPECT_REQUEST_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_078_002, "检验申请导入数据不能为空"); + ErrorCode INSPECT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_078_001, "到货检验申请子不存在"); + ErrorCode INSPECT_REQUEST_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_078_002, "到货检验申请导入数据不能为空"); + ErrorCode INSPECT_REQUEST_JOB_EXISTS = new ErrorCode(1_000_078_003, "到货检验申请存在采购收货任务单"); + ErrorCode INSPECT_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_078_004, "到货检验申请状态不支持关闭"); + ErrorCode INSPECT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_078_005, "到货检验申请状态不支持提交"); + ErrorCode INSPECT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_078_006, "到货检验申请状态不支持审批同意"); + ErrorCode INSPECT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_078_007, "到货检验申请状态不支持处理"); + ErrorCode INSPECT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_078_008, "到货检验申请状态不支持审批拒绝"); //检验任务主ErrorCode ErrorCode INSPECT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_079_000, "检验任务主不存在"); //检验任务子ErrorCode @@ -671,6 +682,7 @@ public interface ErrorCodeConstants { ErrorCode DELIVERPLAN_MAIN_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_020_015, "导入发货计划不能为空"); ErrorCode DELIVER_PLAN_MAIN_NOT_EXISTS = new ErrorCode(1_000_118_000, "发货计划主不存在"); ErrorCode DELIVER_PLAN_DETAIL_NOT_EXISTS = new ErrorCode(1_000_118_001, "发货计划子不存在"); + ErrorCode DELIVER_PLAN_STATUS_NOT_NEW = new ErrorCode(1_000_118_002, "发货计划不是新增状态"); //发货申请ErrorCode ErrorCode DELIVER_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_119_000, "发货申请主不存在"); ErrorCode DELIVER_REQUEST_NOT_EXISTS = new ErrorCode(1_000_119_000, "发货申请不存在"); @@ -682,6 +694,8 @@ public interface ErrorCodeConstants { //发货记录ErrorCode ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_121_000, "发货记录主不存在"); ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_121_001, "发货记录子不存在"); + ErrorCode DELIVER_RECORD_DETAIL_EXCEPTION = new ErrorCode(1_000_121_002, "发货记录问题:【{}】"); + ErrorCode DELIVER_ORDER_DETAIL_EXCEPTION = new ErrorCode(1_000_121_003, "发货订单问题:【{}】"); //客户收货申请ErrorCode ErrorCode CUSTOMERRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "客户收货申请主不存在"); ErrorCode CUSTOMERRECEIPT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "客户收货申请主不存在"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java index 954f7285..75de7ed0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java @@ -9,10 +9,13 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.accountcalendar.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarRespVO; import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert; import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.accountcalendar.AccountcalendarService; import io.swagger.v3.oas.annotations.Operation; @@ -80,15 +83,6 @@ public class AccountcalendarController { return success(AccountcalendarConvert.INSTANCE.convert(accountcalendar)); } - @GetMapping("/list") - @Operation(summary = "获得账期日历列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") - public CommonResult> getAccountcalendarList(@RequestParam("ids") Collection ids) { - List list = accountcalendarService.getAccountcalendarList(ids); - return success(AccountcalendarConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得账期日历分页") @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") @@ -123,16 +117,31 @@ public class AccountcalendarController { public void exportAccountcalendarExcel(@Valid AccountcalendarExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = accountcalendarService.getAccountcalendarList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "账期日历.xlsx", "数据", AccountcalendarExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出账期日历 Excel") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:export')") + @OperateLog(type = EXPORT) + public void exportAccountcalendarExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = accountcalendarService.getAccountcalendarList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "账期日历.xlsx", "数据", AccountcalendarExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(6, available); // 导出 Excel - List datas = AccountcalendarConvert.INSTANCE.convertList02(list); - for(AccountcalendarExcelVO vo : datas) { + List resultList = AccountcalendarConvert.INSTANCE.convertList02(list); + for(AccountcalendarExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - }Map mapDropDown = new HashMap<>(); - String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(6, available); - ExcelUtils.write(response, "账期日历.xls", "数据", AccountcalendarExcelVO.class, datas,mapDropDown); + } + return resultList; } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java index dceff1d3..3a77c42a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java @@ -10,9 +10,12 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.areabasic.vo.*; import com.win.module.wms.controller.dock.vo.DockRespVO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.convert.areabasic.AreabasicConvert; import com.win.module.wms.convert.dock.DockConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.areabasic.AreabasicService; import io.swagger.v3.oas.annotations.Operation; @@ -109,15 +112,31 @@ public class AreabasicController { public void exportAreabasicExcel(@Valid AreabasicExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = areabasicService.getAreabasicList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "库区.xlsx", "数据", AreabasicExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出库区 Excel") + @PreAuthorize("@ss.hasPermission('wms:areabasic:export')") + @OperateLog(type = EXPORT) + public void exportAreabasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = areabasicService.getAreabasicList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "库区.xlsx", "数据", AreabasicExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { // 导出 Excel - List datas = AreabasicConvert.INSTANCE.convertList02(list); - for(AreabasicExcelVO vo : datas) { + List resultList = AreabasicConvert.INSTANCE.convertList02(list); + for(AreabasicExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "库区.xls", "数据", AreabasicExcelVO.class, datas); + return resultList; } + @PostMapping("/senior") @Operation(summary = "高级搜索获得库区分页") @PreAuthorize("@ss.hasPermission('wms:areabasic:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java index 8cfa4622..7e8ae589 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java @@ -9,10 +9,13 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.bom.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO; import com.win.module.wms.convert.bom.BomConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.itempackaging.ItempackagingConvert; import com.win.module.wms.dal.dataobject.bom.BomDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.bom.BomService; import io.swagger.v3.oas.annotations.Operation; @@ -80,14 +83,6 @@ public class BomController { return success(BomConvert.INSTANCE.convert(bom)); } - @GetMapping("/list") - @Operation(summary = "获得物料清单列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:bom:query')") - public CommonResult> getBomList(@RequestParam("ids") Collection ids) { - List list = bomService.getBomList(ids); - return success(BomConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得物料清单分页") @@ -125,21 +120,34 @@ public class BomController { public void exportBomExcel(@Valid BomExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = bomService.getBomList(exportReqVO); - // 导出 Excel - List datas = BomConvert.INSTANCE.convertList02(list); - for(BomExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物品基本信息.xlsx", "数据", BomExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出物料清单 Excel") + @PreAuthorize("@ss.hasPermission('wms:bom:export')") + @OperateLog(type = EXPORT) + public void exportBomExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = bomService.getBomList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物料清单.xlsx", "数据", BomExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] componentUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(2, componentUom); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(7, available); - ExcelUtils.write(response, "物料清单.xls", "数据", BomExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = BomConvert.INSTANCE.convertList02(list); + for(BomExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } - @GetMapping("/get-import-template") @Operation(summary = "获得导入物料清单模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java index 38555c88..7cbb5d6d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java @@ -78,15 +78,9 @@ public class CountRequestDetailBaseVO { private String itemCode; @Schema(description = "从包装号") - private String fromPackingNumber; - - @Schema(description = "到包装号") - private String toPackingNumber; + private String packingNumber; @Schema(description = "从器具号") - private String fromContainerNumber; - - @Schema(description = "到器具号") - private String toContainerNumber; + private String containerNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExcelVO.java index de01b3f4..28895740 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExcelVO.java @@ -77,15 +77,8 @@ public class CountRequestDetailExcelVO { private String itemCode; @ExcelProperty("从包装号") - private String fromPackingNumber; - - @ExcelProperty("到包装号") - private String toPackingNumber; + private String packingNumber; @ExcelProperty("从器具号") - private String fromContainerNumber; - - @ExcelProperty("到器具号") - private String toContainerNumber; - + private String containerNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExportReqVO.java index 88217237..5cd7dcc4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExportReqVO.java @@ -72,15 +72,8 @@ public class CountRequestDetailExportReqVO { private String itemCode; @Schema(description = "从包装号") - private String fromPackingNumber; - - @Schema(description = "到包装号") - private String toPackingNumber; + private String packingNumber; @Schema(description = "从器具号") - private String fromContainerNumber; - - @Schema(description = "到器具号") - private String toContainerNumber; - + private String containerNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java index 63e4be17..242dd6f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java @@ -74,15 +74,10 @@ public class CountRequestDetailPageReqVO extends PageParam { private String itemCode; @Schema(description = "从包装号") - private String fromPackingNumber; - - @Schema(description = "到包装号") - private String toPackingNumber; + private String packingNumber; @Schema(description = "从器具号") - private String fromContainerNumber; + private String containerNumber; - @Schema(description = "到器具号") - private String toContainerNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java index f5cb5bf7..bba5ed96 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java @@ -10,9 +10,12 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.accountcalendar.vo.AccountcalendarRespVO; import com.win.module.wms.controller.currencyexchange.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert; import com.win.module.wms.convert.currencyexchange.CurrencyexchangeConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.currencyexchange.CurrencyexchangeService; import io.swagger.v3.oas.annotations.Operation; @@ -80,15 +83,6 @@ public class CurrencyexchangeController { return success(CurrencyexchangeConvert.INSTANCE.convert(currencyexchange)); } - @GetMapping("/list") - @Operation(summary = "获得货币转换列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:currencyexchange:query')") - public CommonResult> getCurrencyexchangeList(@RequestParam("ids") Collection ids) { - List list = currencyexchangeService.getCurrencyexchangeList(ids); - return success(CurrencyexchangeConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得货币转换分页") @PreAuthorize("@ss.hasPermission('wms:currencyexchange:query')") @@ -122,19 +116,35 @@ public class CurrencyexchangeController { public void exportCurrencyexchangeExcel(@Valid CurrencyexchangeExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = currencyexchangeService.getCurrencyexchangeList(exportReqVO); - // 导出 Excel - List datas = CurrencyexchangeConvert.INSTANCE.convertList02(list); - for(CurrencyexchangeExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "货币转换.xlsx", "数据", CurrencyexchangeExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出货币转换 Excel") + @PreAuthorize("@ss.hasPermission('wms:currencyexchange:export')") + @OperateLog(type = EXPORT) + public void exportCurrencyexchangeExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = currencyexchangeService.getCurrencyexchangeList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "货币转换.xlsx", "数据", CurrencyexchangeExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); mapDropDown.put(0, currency); String[] isRequired = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(3, isRequired); - ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = CurrencyexchangeConvert.INSTANCE.convertList02(list); + for(CurrencyexchangeExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入货币转换模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java index ad7dc8ca..4d3e2158 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java @@ -10,10 +10,13 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo; import com.win.module.wms.controller.customer.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO; import com.win.module.wms.convert.customer.CustomerConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.itempackaging.ItempackagingConvert; import com.win.module.wms.dal.dataobject.customer.CustomerDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customer.CustomerService; import io.swagger.v3.oas.annotations.Operation; @@ -122,22 +125,38 @@ public class CustomerController { public void exportCustomerExcel(@Valid CustomerExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = customerService.getCustomerList(exportReqVO); - // 导出 Excel - List datas = CustomerConvert.INSTANCE.convertList02(list); - for(CustomerExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户.xlsx", "数据", CustomerExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出客户 Excel") + @PreAuthorize("@ss.hasPermission('wms:customer:export')") + @OperateLog(type = EXPORT) + public void exportCustomerExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = customerService.getCustomerList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户.xlsx", "数据", CustomerExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); mapDropDown.put(11, currency); String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CUSTOMER_TYPE); mapDropDown.put(13, type); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(14, available); - ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = CustomerConvert.INSTANCE.convertList02(list); + for(CustomerExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } + + @GetMapping("/get-import-template") @Operation(summary = "获得导入客户模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java index 32fd5169..9f27940f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java @@ -10,9 +10,12 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customer.vo.CustomerRespVO; import com.win.module.wms.controller.customerdock.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.convert.customer.CustomerConvert; import com.win.module.wms.convert.customerdock.CustomerdockConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customerdock.CustomerdockService; import io.swagger.v3.oas.annotations.Operation; @@ -80,15 +83,6 @@ public class CustomerdockController { return success(CustomerdockConvert.INSTANCE.convert(customerdock)); } - @GetMapping("/list") - @Operation(summary = "获得客户月台列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:customerdock:query')") - public CommonResult> getCustomerdockList(@RequestParam("ids") Collection ids) { - List list = customerdockService.getCustomerdockList(ids); - return success(CustomerdockConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得客户月台分页") @PreAuthorize("@ss.hasPermission('wms:customerdock:query')") @@ -122,15 +116,31 @@ public class CustomerdockController { public void exportCustomerdockExcel(@Valid CustomerdockExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = customerdockService.getCustomerdockList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户月台.xlsx", "数据", CustomerdockExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出客户月台 Excel") + @PreAuthorize("@ss.hasPermission('wms:customerdock:export')") + @OperateLog(type = EXPORT) + public void exportCustomerdockExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = customerdockService.getCustomerdockList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户月台.xlsx", "数据", CustomerdockExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { // 导出 Excel - List datas = CustomerdockConvert.INSTANCE.convertList02(list); - for(CustomerdockExcelVO vo : datas) { + List resultList =CustomerdockConvert.INSTANCE.convertList02(list); + for(CustomerdockExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "客户月台.xls", "数据", CustomerdockExcelVO.class, datas); + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入客户月台模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java index b033056f..c0fff056 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java @@ -10,9 +10,12 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerdock.vo.CustomerdockRespVO; import com.win.module.wms.controller.customeritem.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.convert.customerdock.CustomerdockConvert; import com.win.module.wms.convert.customeritem.CustomeritemConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customeritem.CustomeritemService; import io.swagger.v3.oas.annotations.Operation; @@ -80,14 +83,6 @@ public class CustomeritemController { return success(CustomeritemConvert.INSTANCE.convert(customeritem)); } - @GetMapping("/list") - @Operation(summary = "获得客户物品列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:customeritem:query')") - public CommonResult> getCustomeritemList(@RequestParam("ids") Collection ids) { - List list = customeritemService.getCustomeritemList(ids); - return success(CustomeritemConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得客户物品分页") @@ -122,14 +117,21 @@ public class CustomeritemController { public void exportCustomeritemExcel(@Valid CustomeritemExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = customeritemService.getCustomeritemList(exportReqVO); - // 导出 Excel - List datas = CustomeritemConvert.INSTANCE.convertList02(list); - for(CustomeritemExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户物品.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出客户物品 Excel") + @PreAuthorize("@ss.hasPermission('wms:customeritem:export')") + @OperateLog(type = EXPORT) + public void exportCustomeritemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = customeritemService.getCustomeritemList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "客户物品.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] cusotmerUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(3, cusotmerUom); String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); @@ -138,7 +140,14 @@ public class CustomeritemController { mapDropDown.put(7, altPackUnit); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(10, available); - ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = CustomeritemConvert.INSTANCE.convertList02(list); + for(CustomeritemExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java index be009974..5a2ee084 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java @@ -88,4 +88,7 @@ public class CustomerreturnRequestDetailExcelVO { @ExcelProperty("到货主代码") private String toOwnerCode; + @ExcelProperty("到库位代码") + private String toLocationCode; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java index b0289919..f593a2fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java @@ -83,6 +83,9 @@ public class CustomerreturnRequestDetailExportReqVO { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "到库位代码") + private String toLocationCode; + @Schema(description = "主表id") private Long masterId; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java index 8f25f422..b8f28ca3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java @@ -85,4 +85,7 @@ public class CustomerreturnRequestDetailPageReqVO extends PageParam { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "到库位代码") + private String toLocationCode; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java index e68bdbbf..a60a522d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java @@ -8,10 +8,13 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.dock.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO; import com.win.module.wms.convert.dock.DockConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.warehouse.WarehouseConvert; import com.win.module.wms.dal.dataobject.dock.DockDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.mysql.dock.DockMapper; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.dock.DockService; @@ -124,19 +127,33 @@ public class DockController { public void exportDockExcel(@Valid DockExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = dockService.getDockList(exportReqVO); - // 导出 Excel - List datas = DockConvert.INSTANCE.convertList02(list); - for(DockExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "月台.xlsx", "数据", DockExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出月台 Excel") + @PreAuthorize("@ss.hasPermission('wms:dock:export')") + @OperateLog(type = EXPORT) + public void exportDockExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = dockService.getDockList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "月台.xlsx", "数据", DockExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCK_TYPE); mapDropDown.put(5, type); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(10, available);; - ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = DockConvert.INSTANCE.convertList02(list); + for(DockExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java index 9cd137f3..1d6c2dea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java @@ -1,34 +1,34 @@ package com.win.module.wms.controller.expectin; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.expectin.vo.ExpectinExcelVO; +import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; +import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; +import com.win.module.wms.controller.expectin.vo.ExpectinRespVO; +import com.win.module.wms.convert.expectin.ExpectinConvert; +import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; +import com.win.module.wms.service.expectin.ExpectinService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.List; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.expectin.vo.*; -import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; -import com.win.module.wms.convert.expectin.ExpectinConvert; -import com.win.module.wms.service.expectin.ExpectinService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 预计入库存") @RestController @@ -42,28 +42,22 @@ public class ExpectinController { @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建预计入库存") - @PreAuthorize("@ss.hasPermission('wms:expectin:create')") - public CommonResult createExpectin(@Valid @RequestBody ExpectinCreateReqVO createReqVO) { - return success(expectinService.createExpectin(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新预计入库存") - @PreAuthorize("@ss.hasPermission('wms:expectin:update')") - public CommonResult updateExpectin(@Valid @RequestBody ExpectinUpdateReqVO updateReqVO) { - expectinService.updateExpectin(updateReqVO); - return success(true); + @DeleteMapping("/delete") + @Operation(summary = "根据任务号删除预计入库存") + @Parameter(name = "jobNumber", description = "任务号", required = true) + @PreAuthorize("@ss.hasPermission('wms:expectin:delete')") + public CommonResult deleteExpectin(@RequestParam("jobNumber") String jobNumber) { + Integer result = expectinService.deleteExpectinByJobNumber(jobNumber); + return success(result > 0); } - @DeleteMapping("/delete") + @DeleteMapping("/deleteByJobNumber") @Operation(summary = "删除预计入库存") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:expectin:delete')") public CommonResult deleteExpectin(@RequestParam("id") Long id) { - expectinService.deleteExpectin(id); - return success(true); + Integer result = expectinService.deleteExpectin(id); + return success(result > 0); } @GetMapping("/get") @@ -75,15 +69,6 @@ public class ExpectinController { return success(ExpectinConvert.INSTANCE.convert(expectin)); } - @GetMapping("/list") - @Operation(summary = "获得预计入库存列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:expectin:query')") - public CommonResult> getExpectinList(@RequestParam("ids") Collection ids) { - List list = expectinService.getExpectinList(ids); - return success(ExpectinConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得预计入库存分页") @PreAuthorize("@ss.hasPermission('wms:expectin:query')") @@ -110,14 +95,25 @@ public class ExpectinController { @Operation(summary = "导出预计入库存 Excel") @PreAuthorize("@ss.hasPermission('wms:expectin:export')") @OperateLog(type = EXPORT) - public void exportExpectinExcel(@Valid ExpectinExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportExpectinExcel(@Valid ExpectinExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = expectinService.getExpectinList(exportReqVO); - // 导出 Excel List datas = ExpectinConvert.INSTANCE.convertList02(list); for(ExpectinExcelVO vo : datas) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + ExcelUtils.write(response, "预计入库存.xls", "数据", ExpectinExcelVO.class, datas); + } + + @PostMapping("/export-excel-senior") + @Operation(summary = "导出预计入库存 Excel") + @PreAuthorize("@ss.hasPermission('wms:expectin:export')") + @OperateLog(type = EXPORT) + public void exportExpectinExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = expectinService.getExpectinList(conditions); + List datas = ExpectinConvert.INSTANCE.convertList02(list); + for(ExpectinExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); vo.setCreator(user.getNickname()); } ExcelUtils.write(response, "预计入库存.xls", "数据", ExpectinExcelVO.class, datas); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinBaseVO.java index 564ec697..2c1f3f20 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinBaseVO.java @@ -1,10 +1,10 @@ package com.win.module.wms.controller.expectin.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; +import lombok.Data; + +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import javax.validation.constraints.*; /** * 预计入库存 Base VO，提供给添加、修改、详细的子 VO 使用 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java index 35fcc3a6..ebabfb4a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java @@ -1,34 +1,34 @@ package com.win.module.wms.controller.expectout; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.expectout.vo.ExpectoutExcelVO; +import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; +import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; +import com.win.module.wms.controller.expectout.vo.ExpectoutRespVO; +import com.win.module.wms.convert.expectout.ExpectoutConvert; +import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; +import com.win.module.wms.service.expectout.ExpectoutService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.List; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.expectout.vo.*; -import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; -import com.win.module.wms.convert.expectout.ExpectoutConvert; -import com.win.module.wms.service.expectout.ExpectoutService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 预计出库存") @RestController @@ -42,28 +42,22 @@ public class ExpectoutController { @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建预计出库存") - @PreAuthorize("@ss.hasPermission('wms:expectout:create')") - public CommonResult createExpectout(@Valid @RequestBody ExpectoutCreateReqVO createReqVO) { - return success(expectoutService.createExpectout(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新预计出库存") - @PreAuthorize("@ss.hasPermission('wms:expectout:update')") - public CommonResult updateExpectout(@Valid @RequestBody ExpectoutUpdateReqVO updateReqVO) { - expectoutService.updateExpectout(updateReqVO); - return success(true); - } - @DeleteMapping("/delete") @Operation(summary = "删除预计出库存") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:expectout:delete')") public CommonResult deleteExpectout(@RequestParam("id") Long id) { - expectoutService.deleteExpectout(id); - return success(true); + int result = expectoutService.deleteExpectout(id); + return success(result > 0); + } + + @DeleteMapping("/deleteByJobNumber") + @Operation(summary = "根据任务号删除预计出库存") + @Parameter(name = "jobNumber", description = "任务号", required = true) + @PreAuthorize("@ss.hasPermission('wms:expectout:delete')") + public CommonResult deleteExpectout(@RequestParam("jobNumber") String jobNumber) { + int result = expectoutService.deleteExpectoutByJobNumber(jobNumber); + return success(result > 0); } @GetMapping("/get") @@ -75,15 +69,6 @@ public class ExpectoutController { return success(ExpectoutConvert.INSTANCE.convert(expectout)); } - @GetMapping("/list") - @Operation(summary = "获得预计出库存列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:expectout:query')") - public CommonResult> getExpectoutList(@RequestParam("ids") Collection ids) { - List list = expectoutService.getExpectoutList(ids); - return success(ExpectoutConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得预计出库存分页") @PreAuthorize("@ss.hasPermission('wms:expectout:query')") @@ -110,14 +95,25 @@ public class ExpectoutController { @Operation(summary = "导出预计出库存 Excel") @PreAuthorize("@ss.hasPermission('wms:expectout:export')") @OperateLog(type = EXPORT) - public void exportExpectoutExcel(@Valid ExpectoutExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportExpectoutExcel(@Valid ExpectoutExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = expectoutService.getExpectoutList(exportReqVO); - // 导出 Excel List datas = ExpectoutConvert.INSTANCE.convertList02(list); for(ExpectoutExcelVO vo : datas) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + ExcelUtils.write(response, "预计出库存.xls", "数据", ExpectoutExcelVO.class, datas); + } + + @GetMapping("/export-excel-senior") + @Operation(summary = "导出预计出库存 Excel") + @PreAuthorize("@ss.hasPermission('wms:expectout:export')") + @OperateLog(type = EXPORT) + public void exportExpectoutExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = expectoutService.getExpectoutList(conditions); + List datas = ExpectoutConvert.INSTANCE.convertList02(list); + for(ExpectoutExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); vo.setCreator(user.getNickname()); } ExcelUtils.write(response, "预计出库存.xls", "数据", ExpectoutExcelVO.class, datas); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java index 74e59f55..862fe35e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java @@ -1,35 +1,26 @@ package com.win.module.wms.controller.inspectJob; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO; +import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailRespVO; +import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; +import com.win.module.wms.service.inspectJob.InspectJobDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; +import javax.annotation.Resource; +import javax.validation.Valid; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.inspectJob.vo.*; -import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; -import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert; -import com.win.module.wms.service.inspectJob.InspectJobDetailService; - @Tag(name = "管理后台 - 检验任务子") @RestController @RequestMapping("/wms/inspect-job-detail") @@ -42,48 +33,6 @@ public class InspectJobDetailController { @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建检验任务子") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:create')") - public CommonResult createInspectJobDetail(@Valid @RequestBody InspectJobDetailCreateReqVO createReqVO) { - return success(inspectJobDetailService.createInspectJobDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新检验任务子") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:update')") - public CommonResult updateInspectJobDetail(@Valid @RequestBody InspectJobDetailUpdateReqVO updateReqVO) { - inspectJobDetailService.updateInspectJobDetail(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除检验任务子") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:delete')") - public CommonResult deleteInspectJobDetail(@RequestParam("id") Long id) { - inspectJobDetailService.deleteInspectJobDetail(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得检验任务子") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')") - public CommonResult getInspectJobDetail(@RequestParam("id") Long id) { - InspectJobDetailDO inspectJobDetail = inspectJobDetailService.getInspectJobDetail(id); - return success(InspectJobDetailConvert.INSTANCE.convert(inspectJobDetail)); - } - - @GetMapping("/list") - @Operation(summary = "获得检验任务子列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')") - public CommonResult> getInspectJobDetailList(@RequestParam("ids") Collection ids) { - List list = inspectJobDetailService.getInspectJobDetailList(ids); - return success(InspectJobDetailConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得检验任务子分页") @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')") @@ -105,21 +54,5 @@ public class InspectJobDetailController { } return success(result); } - @GetMapping("/export-excel") - @Operation(summary = "导出检验任务子 Excel") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:export')") - @OperateLog(type = EXPORT) - public void exportInspectJobDetailExcel(@Valid InspectJobDetailExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = inspectJobDetailService.getInspectJobDetailList(exportReqVO); - // 导出 Excel - List datas = InspectJobDetailConvert.INSTANCE.convertList02(list); - for(InspectJobDetailExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "检验任务子.xls", "数据", InspectJobDetailExcelVO.class, datas); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java index e6f1709e..ce9b7367 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java @@ -1,38 +1,41 @@ package com.win.module.wms.controller.inspectJob; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.dict.core.util.DictFrameworkUtils; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectJob.vo.*; import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert; +import com.win.module.wms.convert.inspectJob.InspectJobMainConvert; import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; +import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.service.inspectJob.InspectJobDetailService; +import com.win.module.wms.service.inspectJob.InspectJobMainService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import jodd.util.StringUtil; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; -import com.win.module.wms.convert.inspectJob.InspectJobMainConvert; -import com.win.module.wms.service.inspectJob.InspectJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 检验任务主") @RestController @@ -49,48 +52,6 @@ public class InspectJobMainController { @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建检验任务主") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:create')") - public CommonResult createInspectJobMain(@Valid @RequestBody InspectJobMainCreateReqVO createReqVO) { - return success(inspectJobMainService.createInspectJobMain(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新检验任务主") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:update')") - public CommonResult updateInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) { - inspectJobMainService.updateInspectJobMain(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除检验任务主") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:delete')") - public CommonResult deleteInspectJobMain(@RequestParam("id") Long id) { - inspectJobMainService.deleteInspectJobMain(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得检验任务主") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')") - public CommonResult getInspectJobMain(@RequestParam("id") Long id) { - InspectJobMainDO inspectJobMain = inspectJobMainService.getInspectJobMain(id); - return success(InspectJobMainConvert.INSTANCE.convert(inspectJobMain)); - } - - @GetMapping("/list") - @Operation(summary = "获得检验任务主列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')") - public CommonResult> getInspectJobMainList(@RequestParam("ids") Collection ids) { - List list = inspectJobMainService.getInspectJobMainList(ids); - return success(InspectJobMainConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得检验任务主分页") @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')") @@ -112,21 +73,66 @@ public class InspectJobMainController { } return success(result); } + @GetMapping("/export-excel") @Operation(summary = "导出检验任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:export')") @OperateLog(type = EXPORT) - public void exportInspectJobMainExcel(@Valid InspectJobMainExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportInspectJobMainExcel(@Valid InspectJobMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = inspectJobMainService.getInspectJobMainList(exportReqVO); - // 导出 Excel - List datas = InspectJobMainConvert.INSTANCE.convertList02(list); - for(InspectJobMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, resultList, mapDropDown); + } + + @GetMapping("/export-excel-senior") + @Operation(summary = "导出检验任务主 Excel") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:export')") + @OperateLog(type = EXPORT) + public void exportInspectJobMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = inspectJobMainService.getInspectJobMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map mapDropDown) { + //组装vo + String[] status = JobStatusEnum.getStatusNameArray(); + mapDropDown.put(6, status); + String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE); + mapDropDown.put(6, transferMode); + String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE); + mapDropDown.put(24, inspectType); + String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION); + mapDropDown.put(25, nextAction); + String[] sampleMethod = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SAMPLE_METHOD); + mapDropDown.put(26, sampleMethod); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(27, uom); + String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(31, trueFalse); + mapDropDown.put(32, trueFalse); + mapDropDown.put(33, trueFalse); + mapDropDown.put(34, trueFalse); + mapDropDown.put(35, trueFalse); + mapDropDown.put(36, trueFalse); + mapDropDown.put(37, trueFalse); + mapDropDown.put(38, trueFalse); + mapDropDown.put(39, trueFalse); + mapDropDown.put(40, trueFalse); + String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); + mapDropDown.put(43, inventoryStatus); + List resultList = new ArrayList<>(); + // 导出 + for(InspectJobMainDO mainDO : list) { + List subList = inspectJobDetailService.selectList(mainDO.getId()); + for(InspectJobDetailDO detailDO : subList) { + InspectJobMainExcelVO vo = InspectJobMainConvert.INSTANCE.convert(mainDO, detailDO); + resultList.add(vo); + } } - ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, datas); + return resultList; } @GetMapping("/getInspectJobById") @@ -184,4 +190,29 @@ public class InspectJobMainController { return success(countByStatus); } + @Operation(summary = "承接任务") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:accept')") + @PostMapping(value = "/accept/{id}") + public CommonResult acceptInspectJobMain(@PathVariable("id") Long id) { + int result = inspectJobMainService.acceptInspectJobMain(id); + return success(result > 0); + } + + @Operation(summary = "取消承接任务") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:cancel-accept')") + @PostMapping(value = "/cancelAccept/{id}") + public CommonResult cancelAcceptInspectJobMain(@PathVariable("id") Long id) { + int result = inspectJobMainService.cancelAcceptInspectJobMain(id); + return success(result > 0); + } + + @PutMapping("/execute") + @Operation(summary = "执行任务") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:execute')") + public CommonResult excuteInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) { + Integer count = inspectJobMainService.excuteInspectJobMain(updateReqVO); + return success(count > 0); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java index de2a3b05..e48fa265 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java @@ -1,12 +1,13 @@ package com.win.module.wms.controller.inspectJob.vo; -import lombok.*; - -import java.math.BigDecimal; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -63,4 +64,7 @@ public class InspectJobDetailPageReqVO extends PageParam { @Schema(description = "计量单位") private String uom; + @Schema(description = "主表ID", example = "6060") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java index e7f8404b..cf6b298b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java @@ -1,21 +1,14 @@ package com.win.module.wms.controller.inspectJob.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.math.BigDecimal; - import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.enums.job.JobStatusConverter; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; /** @@ -44,23 +37,12 @@ public class InspectJobMainExcelVO { @ExcelProperty("要求截止时间") private LocalDateTime requestDueTime; - @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat("job_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @ExcelProperty(value = "状态", converter = JobStatusConverter.class) private String status; @ExcelProperty("过期时间") private LocalDateTime expiredTime; - @ExcelProperty("最后更新时间") - private LocalDateTime updateTime; - - @ExcelProperty("最后更新者Id") - private String updater; - - @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 - private String jobStageStatus; - @ExcelProperty("优先级") private Integer priority; @@ -97,12 +79,6 @@ public class InspectJobMainExcelVO { @ExcelProperty("备注") private String remark; - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @ExcelProperty("创建者id") - private String creator; - @ExcelProperty("订单号") private String poUmber; @@ -116,19 +92,19 @@ public class InspectJobMainExcelVO { private String itemCode; @ExcelProperty(value = "检验类型", converter = DictConvert.class) - @DictFormat("inspect_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.INSPECT_TYPE) private String inspectType; @ExcelProperty(value = "下一步检验动作", converter = DictConvert.class) - @DictFormat("next_action") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.NEXT_ACTION) private String nextAction; @ExcelProperty(value = "抽检方式", converter = DictConvert.class) - @DictFormat("sample_method") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.SAMPLE_METHOD) private String sampleMethod; @ExcelProperty(value = "计量单位", converter = DictConvert.class) - @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.UOM) private String uom; @ExcelProperty("收货数量") @@ -141,43 +117,83 @@ public class InspectJobMainExcelVO { private String owner; @ExcelProperty(value = "自动完成", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String autoComplete; @ExcelProperty(value = "允许修改库位", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowModifyLocation; @ExcelProperty(value = "允许修改数量", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowModifyQty; @ExcelProperty(value = "允许大于推荐数量", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowBiggerQty; @ExcelProperty(value = "允许小于推荐数量", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowSmallerQty; @ExcelProperty(value = "允许修改库存状态", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowModifyInventoryStatus; @ExcelProperty(value = "允许连续扫描", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowContinuousScanning; @ExcelProperty(value = "允许部分完成", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowPartialComplete; @ExcelProperty(value = "允许修改批次", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowModifyBatch; @ExcelProperty(value = "允许修改箱码", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowModifyPackingNumber; + @ExcelProperty("包装号") + private String packingNumber; + + @ExcelProperty("器具号") + private String containerNumber; + + @ExcelProperty(value = "库存状态", converter = DictConvert.class) + @DictFormat(DictTypeConstants.INVENTORY_STATUS) + private String inventoryStatus; + + @ExcelProperty("从库位代码") + private String fromLocationCode; + + @ExcelProperty("物品名称") + private String itemName; + + @ExcelProperty("物品描述1") + private String itemDesc1; + + @ExcelProperty("物品描述2") + private String itemDesc2; + + @ExcelProperty("项目代码") + private String projectCode; + + @ExcelProperty("数量") + private BigDecimal qty; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("创建者Id") + private String creator; + + @ExcelProperty("最后更新时间") + private LocalDateTime updateTime; + + @ExcelProperty("最后更新者Id") + private String updater; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java index 2e55c7ae..05d7d0b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java @@ -1,35 +1,26 @@ package com.win.module.wms.controller.inspectRecord; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailRespVO; +import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert; +import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; +import com.win.module.wms.service.inspectRecord.InspectRecordDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; +import javax.annotation.Resource; +import javax.validation.Valid; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.inspectRecord.vo.*; -import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; -import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert; -import com.win.module.wms.service.inspectRecord.InspectRecordDetailService; - @Tag(name = "管理后台 - 检验记录子") @RestController @RequestMapping("/wms/inspect-record-detail") @@ -42,48 +33,6 @@ public class InspectRecordDetailController { @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建检验记录子") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:create')") - public CommonResult createInspectRecordDetail(@Valid @RequestBody InspectRecordDetailCreateReqVO createReqVO) { - return success(inspectRecordDetailService.createInspectRecordDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新检验记录子") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:update')") - public CommonResult updateInspectRecordDetail(@Valid @RequestBody InspectRecordDetailUpdateReqVO updateReqVO) { - inspectRecordDetailService.updateInspectRecordDetail(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除检验记录子") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:delete')") - public CommonResult deleteInspectRecordDetail(@RequestParam("id") Long id) { - inspectRecordDetailService.deleteInspectRecordDetail(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得检验记录子") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')") - public CommonResult getInspectRecordDetail(@RequestParam("id") Long id) { - InspectRecordDetailDO inspectRecordDetail = inspectRecordDetailService.getInspectRecordDetail(id); - return success(InspectRecordDetailConvert.INSTANCE.convert(inspectRecordDetail)); - } - - @GetMapping("/list") - @Operation(summary = "获得检验记录子列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')") - public CommonResult> getInspectRecordDetailList(@RequestParam("ids") Collection ids) { - List list = inspectRecordDetailService.getInspectRecordDetailList(ids); - return success(InspectRecordDetailConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得检验记录子分页") @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')") @@ -105,22 +54,5 @@ public class InspectRecordDetailController { } return success(result); } - - @GetMapping("/export-excel") - @Operation(summary = "导出检验记录子 Excel") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:export')") - @OperateLog(type = EXPORT) - public void exportInspectRecordDetailExcel(@Valid InspectRecordDetailExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = inspectRecordDetailService.getInspectRecordDetailList(exportReqVO); - // 导出 Excel - List datas = InspectRecordDetailConvert.INSTANCE.convertList02(list); - for(InspectRecordDetailExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "检验记录子.xls", "数据", InspectRecordDetailExcelVO.class, datas); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java index 3f9753cf..e5b5ef74 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java @@ -1,34 +1,40 @@ package com.win.module.wms.controller.inspectRecord; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.dict.core.util.DictFrameworkUtils; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inspectRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExcelVO; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainRespVO; +import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert; +import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; +import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO; +import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.service.inspectRecord.InspectRecordDetailService; +import com.win.module.wms.service.inspectRecord.InspectRecordMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO; -import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert; -import com.win.module.wms.service.inspectRecord.InspectRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 检验记录主") @RestController @@ -38,52 +44,12 @@ public class InspectRecordMainController { @Resource private InspectRecordMainService inspectRecordMainService; + @Resource + private InspectRecordDetailService inspectRecordDetailService; @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建检验记录主") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:create')") - public CommonResult createInspectRecordMain(@Valid @RequestBody InspectRecordMainCreateReqVO createReqVO) { - return success(inspectRecordMainService.createInspectRecordMain(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新检验记录主") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:update')") - public CommonResult updateInspectRecordMain(@Valid @RequestBody InspectRecordMainUpdateReqVO updateReqVO) { - inspectRecordMainService.updateInspectRecordMain(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除检验记录主") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:delete')") - public CommonResult deleteInspectRecordMain(@RequestParam("id") Long id) { - inspectRecordMainService.deleteInspectRecordMain(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得检验记录主") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')") - public CommonResult getInspectRecordMain(@RequestParam("id") Long id) { - InspectRecordMainDO inspectRecordMain = inspectRecordMainService.getInspectRecordMain(id); - return success(InspectRecordMainConvert.INSTANCE.convert(inspectRecordMain)); - } - - @GetMapping("/list") - @Operation(summary = "获得检验记录主列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')") - public CommonResult> getInspectRecordMainList(@RequestParam("ids") Collection ids) { - List list = inspectRecordMainService.getInspectRecordMainList(ids); - return success(InspectRecordMainConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得检验记录主分页") @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')") @@ -105,21 +71,60 @@ public class InspectRecordMainController { } return success(result); } + @GetMapping("/export-excel") @Operation(summary = "导出检验记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:export')") @OperateLog(type = EXPORT) - public void exportInspectRecordMainExcel(@Valid InspectRecordMainExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportInspectRecordMainExcel(@Valid InspectRecordMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = inspectRecordMainService.getInspectRecordMainList(exportReqVO); - // 导出 Excel - List datas = InspectRecordMainConvert.INSTANCE.convertList02(list); - for(InspectRecordMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, resultList, mapDropDown); + } + + @GetMapping("/export-excel-senior") + @Operation(summary = "导出检验记录主 Excel") + @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:export')") + @OperateLog(type = EXPORT) + public void exportInspectRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = inspectRecordMainService.getInspectRecordMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map mapDropDown) { + //组装vo + String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE); + mapDropDown.put(11, interfaceType); + String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE); + mapDropDown.put(18, inspectType); + String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION); + mapDropDown.put(19, nextAction); + String[] sampleMethod = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SAMPLE_METHOD); + mapDropDown.put(20, sampleMethod); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(21, uom); + String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(33, locationType); + String[] inspectFailedReason = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_FAILED_REASON); + mapDropDown.put(43, inspectFailedReason); + String[] inspectResult = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_RESULT); + mapDropDown.put(46, inspectResult); + List resultList = new ArrayList<>(); + // 导出 + for(InspectRecordMainDO mainDO : list) { + List subList = inspectRecordDetailService.selectList(mainDO.getId()); + for(InspectRecordDetailDO detailDO : subList) { + InspectRecordMainExcelVO vo = InspectRecordMainConvert.INSTANCE.convert(mainDO, detailDO); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + resultList.add(vo); + } } - ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, datas); + return resultList; } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java index 595bfc1f..a26591d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java @@ -1,13 +1,11 @@ package com.win.module.wms.controller.inspectRecord.vo; -import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; import java.time.LocalDateTime; -import org.springframework.format.annotation.DateTimeFormat; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -109,4 +107,6 @@ public class InspectRecordDetailExportReqVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java index 0e4793f8..e331e518 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java @@ -1,12 +1,13 @@ package com.win.module.wms.controller.inspectRecord.vo; -import lombok.*; - -import java.math.BigDecimal; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -111,4 +112,6 @@ public class InspectRecordDetailPageReqVO extends PageParam { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java index 848d4b0d..cba1b93d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java @@ -1,23 +1,13 @@ package com.win.module.wms.controller.inspectRecord.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; - import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import com.win.module.wms.enums.DictTypeConstants; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; /** @@ -62,7 +52,7 @@ public class InspectRecordMainExcelVO { private String departmentCode; @ExcelProperty(value = "接口类型", converter = DictConvert.class) - @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.INTERFACE_TYPE) private String interfaceType; @ExcelProperty("单据号") @@ -71,15 +61,6 @@ public class InspectRecordMainExcelVO { @ExcelProperty("业务类型") private String businessType; - @ExcelProperty("备注") - private String remark; - - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @ExcelProperty("创建者Id") - private String creator; - @ExcelProperty("代码") private String code; @@ -93,19 +74,19 @@ public class InspectRecordMainExcelVO { private String batch; @ExcelProperty(value = "检验类型", converter = DictConvert.class) - @DictFormat("inspect_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.INSPECT_TYPE) private String inspectType; @ExcelProperty(value = "下一步检验动作", converter = DictConvert.class) - @DictFormat("next_action") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.NEXT_ACTION) private String nextAction; @ExcelProperty(value = "抽检方式", converter = DictConvert.class) - @DictFormat("sample_method") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.SAMPLE_METHOD) private String sampleMethod; @ExcelProperty(value = "计量单位", converter = DictConvert.class) - @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.UOM) private String uom; @ExcelProperty("收货数量") @@ -142,7 +123,84 @@ public class InspectRecordMainExcelVO { private BigDecimal sampleQty; @ExcelProperty(value = "从库位类型范围", converter = DictConvert.class) - @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.LOCATION_TYPE) private String fromLocationTypes; + @ExcelProperty("包装号") + private String packingNumber; + + @ExcelProperty("器具号") + private String containerNumber; + + @ExcelProperty("从库位代码") + private String fromLocationCode; + + @ExcelProperty("从库位组代码") + private String fromLocationGroupCode; + + @ExcelProperty("从库区代码") + private String fromAreaCode; + + @ExcelProperty("合格数量") + private BigDecimal goodQty; + + @ExcelProperty("不合格数量") + private BigDecimal failedQty; + + @ExcelProperty("破坏数量") + private BigDecimal crackQty; + + @ExcelProperty("最终不合格数量") + private BigDecimal notPassedQty; + + @ExcelProperty(value = "不合格原因", converter = DictConvert.class) + @DictFormat(DictTypeConstants.INSPECT_FAILED_REASON) + private String failedReason; + + @ExcelProperty("异常照片") + private String photos; + + @ExcelProperty("检验人") + private String inspectUser; + + @ExcelProperty(value = "检验结果", converter = DictConvert.class) + @DictFormat(DictTypeConstants.INSPECT_RESULT) + private String inspectResult; + + @ExcelProperty("外观") + private String appearance; + + @ExcelProperty("尺寸") + private String volume; + + @ExcelProperty("重量") + private String weight; + + @ExcelProperty("其他属性") + private String otherProperties; + + @ExcelProperty("物品名称") + private String itemName; + + @ExcelProperty("物品描述1") + private String itemDesc1; + + @ExcelProperty("物品描述2") + private String itemDesc2; + + @ExcelProperty("项目代码") + private String projectCode; + + @ExcelProperty("任务明细ID") + private String jobDetailId; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("创建者Id") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java index a5bbc6ce..b4851f10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java @@ -1,35 +1,29 @@ package com.win.module.wms.controller.inspectRequest; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; +import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; +import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailRespVO; +import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailUpdateReqVO; +import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; +import com.win.module.wms.service.inspectRequest.InspectRequestDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; +import javax.annotation.Resource; +import javax.validation.Valid; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.inspectRequest.vo.*; -import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; -import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; -import com.win.module.wms.service.inspectRequest.InspectRequestDetailService; - @Tag(name = "管理后台 - 检验申请子") @RestController @RequestMapping("/wms/inspect-request-detail") @@ -53,8 +47,8 @@ public class InspectRequestDetailController { @Operation(summary = "更新检验申请子") @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:update')") public CommonResult updateInspectRequestDetail(@Valid @RequestBody InspectRequestDetailUpdateReqVO updateReqVO) { - inspectRequestDetailService.updateInspectRequestDetail(updateReqVO); - return success(true); + int result = inspectRequestDetailService.updateInspectRequestDetail(updateReqVO); + return success(result > 0); } @DeleteMapping("/delete") @@ -62,8 +56,8 @@ public class InspectRequestDetailController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:delete')") public CommonResult deleteInspectRequestDetail(@RequestParam("id") Long id) { - inspectRequestDetailService.deleteInspectRequestDetail(id); - return success(true); + int result = inspectRequestDetailService.deleteInspectRequestDetail(id); + return success(result > 0); } @GetMapping("/get") @@ -75,15 +69,6 @@ public class InspectRequestDetailController { return success(InspectRequestDetailConvert.INSTANCE.convert(inspectRequestDetail)); } - @GetMapping("/list") - @Operation(summary = "获得检验申请子列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:query')") - public CommonResult> getInspectRequestDetailList(@RequestParam("ids") Collection ids) { - List list = inspectRequestDetailService.getInspectRequestDetailList(ids); - return success(InspectRequestDetailConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得检验申请子分页") @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:query')") @@ -105,22 +90,5 @@ public class InspectRequestDetailController { } return success(result); } - - @GetMapping("/export-excel") - @Operation(summary = "导出检验申请子 Excel") - @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:export')") - @OperateLog(type = EXPORT) - public void exportInspectRequestDetailExcel(@Valid InspectRequestDetailExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = inspectRequestDetailService.getInspectRequestDetailList(exportReqVO); - // 导出 Excel - List datas = InspectRequestDetailConvert.INSTANCE.convertList02(list); - for(InspectRequestDetailExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "检验申请子.xls", "数据", InspectRequestDetailExcelVO.class, datas); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java index 1341e082..31511742 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java @@ -1,41 +1,40 @@ package com.win.module.wms.controller.inspectRequest; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ConvertUtil; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectRequest.vo.*; +import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.service.inspectRequest.InspectRequestDetailService; +import com.win.module.wms.service.inspectRequest.InspectRequestMainService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; -import javax.validation.*; -import javax.servlet.http.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; -import java.io.IOException; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; -import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert; -import com.win.module.wms.service.inspectRequest.InspectRequestMainService; -import org.springframework.web.multipart.MultipartFile; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 检验申请主") @RestController @@ -46,6 +45,8 @@ public class InspectRequestMainController { @Resource private InspectRequestMainService inspectRequestMainService; @Resource + private InspectRequestDetailService inspectRequestDetailService; + @Resource private AdminUserApi userApi; @PostMapping("/create") @@ -59,8 +60,8 @@ public class InspectRequestMainController { @Operation(summary = "更新检验申请主") @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:update')") public CommonResult updateInspectRequestMain(@Valid @RequestBody InspectRequestMainUpdateReqVO updateReqVO) { - inspectRequestMainService.updateInspectRequestMain(updateReqVO); - return success(true); + int result = inspectRequestMainService.updateInspectRequestMain(updateReqVO); + return success(result > 0); } @DeleteMapping("/delete") @@ -68,8 +69,8 @@ public class InspectRequestMainController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:delete')") public CommonResult deleteInspectRequestMain(@RequestParam("id") Long id) { - inspectRequestMainService.deleteInspectRequestMain(id); - return success(true); + int result = inspectRequestMainService.deleteInspectRequestMain(id); + return success(result > 0); } @GetMapping("/get") @@ -110,21 +111,57 @@ public class InspectRequestMainController { } return success(result); } + @GetMapping("/export-excel") @Operation(summary = "导出检验申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:export')") @OperateLog(type = EXPORT) - public void exportInspectRequestMainExcel(@Valid InspectRequestMainExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportInspectRequestMainExcel(@Valid InspectRequestMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = inspectRequestMainService.getInspectRequestMainList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "到货检验申请主.xls", "检验申请信息列表", InspectRequestMainExcelVO.class, resultList, mapDropDown); + } + + @GetMapping("/export-excel-senior") + @Operation(summary = "导出检验申请主 Excel") + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:export')") + @OperateLog(type = EXPORT) + public void exportInspectRequestMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = inspectRequestMainService.getInspectRequestMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "到货检验申请主.xls", "检验申请信息列表", InspectRequestMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map mapDropDown) { + String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(6, locationType); + String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS); + mapDropDown.put(11, requestStatus); + String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE); + mapDropDown.put(15, inspectType); + String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION); + mapDropDown.put(16, nextAction); + String[] sampleMethod = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SAMPLE_METHOD); + mapDropDown.put(17, sampleMethod); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(18, uom); + String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); + mapDropDown.put(28, inventoryStatus); // 导出 Excel - List datas = InspectRequestMainConvert.INSTANCE.convertList02(list); - for(InspectRequestMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + List resultList = new ArrayList<>(); + for(InspectRequestMainDO mainDO : list) { + List subList = inspectRequestDetailService.selectList(mainDO.getId()); + for(InspectRequestDetailDO detailDO : subList) { + InspectRequestMainExcelVO vo = InspectRequestMainConvert.INSTANCE.convert(mainDO, detailDO); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + resultList.add(vo); + } } - ExcelUtils.write(response, "检验申请主.xls", "数据", InspectRequestMainExcelVO.class, datas); + return resultList; } @GetMapping("/get-import-template") @@ -161,9 +198,55 @@ public class InspectRequestMainController { Map returnMap = new HashMap<>(); returnMap.put("errorCount", errorList.size()); if(!errorList.isEmpty()) { - String url = ExcelUtils.writeLocalFile("检验申请基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xlsx", "错误列表", errorList); + String url = ExcelUtils.writeLocalFile("到货检验申请基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xlsx", "错误列表", errorList); returnMap.put("errorFile", url); } return success(returnMap); } + + @PutMapping("/close") + @Operation(summary = "关闭到货检验申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:close')") + public CommonResult closeInspectRequestMain(@RequestParam("id") Long id) { + Integer count = inspectRequestMainService.closeInspectRequestMain(id); + return success(count > 0); + } + + @PutMapping("/submit") + @Operation(summary = "提交到货检验申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:submit')") + public CommonResult submitInspectRequestMain(@RequestParam("id") Long id) { + Integer count = inspectRequestMainService.submitInspectRequestMain(id); + return success(count > 0); + } + + @PutMapping("/agree") + @Operation(summary = "审批通过到货检验申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:agree')") + public CommonResult agreeInspectRequestMain(@RequestParam("id") Long id) { + Integer count = inspectRequestMainService.agreeInspectRequestMain(id); + return success(count > 0); + } + + @PutMapping("/handle") + @Operation(summary = "执行到货检验申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:handle')") + public CommonResult handleInspectRequestMain(@RequestParam("id") Long id) { + Integer count = inspectRequestMainService.handleInspectRequestMain(id); + return success(count > 0); + } + + @PutMapping("/abort") + @Operation(summary = "审批拒绝到货检验申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:abort')") + public CommonResult abortInspectRequestMain(@RequestParam("id") Long id) { + Integer count = inspectRequestMainService.abortInspectRequestMain(id); + return success(count > 0); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java index 35909461..a6b391c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.inspectRequest.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import javax.validation.constraints.*; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** @@ -20,6 +20,10 @@ public class InspectRequestDetailBaseVO { @Schema(description = "id", example = "id") private Long id; + @Schema(description = "单据号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "单据号不能为空") + private String number; + @Schema(description = "包装号", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "包装号不能为空") private String packingNumber; @@ -27,6 +31,9 @@ public class InspectRequestDetailBaseVO { @Schema(description = "器具号") private String containerNumber; + @Schema(description = "主表ID") + private Long masterId; + @Schema(description = "库存状态") private String inventoryStatus; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java index f0b536c4..fc7501fa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java @@ -1,15 +1,13 @@ package com.win.module.wms.controller.inspectRequest.vo; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.math.BigDecimal; - import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; /** @@ -20,12 +18,18 @@ import com.win.framework.excel.core.convert.DictConvert; @Data public class InspectRequestDetailExcelVO { + @ExcelProperty("单据号") + private String number; + @ExcelProperty("包装号") private String packingNumber; @ExcelProperty("器具号") private String containerNumber; + @ExcelProperty("主表ID") + private Long masterId; + @ExcelProperty(value = "库存状态", converter = DictConvert.class) @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String inventoryStatus; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java index 1a1263ed..f329cab6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java @@ -1,13 +1,11 @@ package com.win.module.wms.controller.inspectRequest.vo; -import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; import java.time.LocalDateTime; -import org.springframework.format.annotation.DateTimeFormat; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -15,12 +13,18 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @Data public class InspectRequestDetailExportReqVO { + @Schema(description = "单据号") + private String number; + @Schema(description = "包装号") private String packingNumber; @Schema(description = "器具号") private String containerNumber; + @Schema(description = "主表ID") + private Long masterId; + @Schema(description = "库存状态") private String inventoryStatus; @@ -55,4 +59,5 @@ public class InspectRequestDetailExportReqVO { @Schema(description = "计量单位") private String uom; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailPageReqVO.java index c0169a33..467f1861 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailPageReqVO.java @@ -1,12 +1,13 @@ package com.win.module.wms.controller.inspectRequest.vo; -import lombok.*; - -import java.math.BigDecimal; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -17,12 +18,18 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @ToString(callSuper = true) public class InspectRequestDetailPageReqVO extends PageParam { + @Schema(description = "单据号") + private String number; + @Schema(description = "包装号") private String packingNumber; @Schema(description = "器具号") private String containerNumber; + @Schema(description = "主表ID") + private Long masterId; + @Schema(description = "库存状态") private String inventoryStatus; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExcelVO.java index 8fb7f2c9..298c1345 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExcelVO.java @@ -1,8 +1,10 @@ package com.win.module.wms.controller.inspectRequest.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import com.win.module.wms.enums.DictTypeConstants; import lombok.Data; import java.math.BigDecimal; @@ -36,18 +38,12 @@ public class InspectRequestMainExcelVO { private String fromAreaCodes; @ExcelProperty(value = "从库位类型范围", converter = DictConvert.class) - @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.LOCATION_TYPE) private String fromLocationTypes; @ExcelProperty("备注") private String remark; - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @ExcelProperty("创建者用户名") - private String creator; - @ExcelProperty("申请时间") private LocalDateTime requestTime; @@ -58,15 +54,9 @@ public class InspectRequestMainExcelVO { private String departmentCode; @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat("request_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.REQUEST_STATUS) private String status; - @ExcelProperty("最后更新时间") - private LocalDateTime updateTime; - - @ExcelProperty("最后更新者用户名") - private String updater; - @ExcelProperty("订单号") private String poNumber; @@ -76,23 +66,20 @@ public class InspectRequestMainExcelVO { @ExcelProperty("批次") private String batch; - @ExcelProperty("物品代码") - private String itemCode; - @ExcelProperty(value = "检验类型", converter = DictConvert.class) - @DictFormat("inspect_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.INSPECT_TYPE) private String inspectType; @ExcelProperty(value = "下一步检验动作", converter = DictConvert.class) - @DictFormat("next_action") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.NEXT_ACTION) private String nextAction; @ExcelProperty(value = "抽检方式", converter = DictConvert.class) - @DictFormat("sample_method") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.SAMPLE_METHOD) private String sampleMethod; @ExcelProperty(value = "计量单位", converter = DictConvert.class) - @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.UOM) private String uom; @ExcelProperty("收货数量") @@ -116,4 +103,48 @@ public class InspectRequestMainExcelVO { @ExcelProperty("直接生成记录") private String directCreateRecord; + @ExcelProperty("包装号") + private String packingNumber; + + @ExcelProperty("器具号") + private String containerNumber; + + @ExcelProperty(value = "库存状态", converter = DictConvert.class) + @DictFormat(DictTypeConstants.INVENTORY_STATUS) + private String inventoryStatus; + + @ExcelProperty("从库位代码") + private String fromLocationCode; + + @ExcelProperty("物品代码") + private String itemCode; + + @ExcelProperty("物品名称") + private String itemName; + + @ExcelProperty("物品描述1") + private String itemDesc1; + + @ExcelProperty("物品描述2") + private String itemDesc2; + + @ExcelProperty("项目代码") + private String projectCode; + + @ExcelProperty("数量") + private BigDecimal qty; + + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; + + @ExcelProperty("最后更新时间") + private LocalDateTime updateTime; + + @ExcelProperty("最后更新者用户名") + private String updater; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java index eebd52cb..763392c7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.inspectRequest.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.util.List; + @Schema(description = "管理后台 - 检验申请主 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class InspectRequestMainRespVO extends InspectRequestMainBaseVO { + @Schema(description = "检验申请子表request_inspect_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java index cdbfa713..dd5f1709 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java @@ -9,6 +9,8 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainExcelVO; +import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.controller.itembasic.vo.*; import com.win.module.wms.convert.itembasic.ItembasicConvert; @@ -20,6 +22,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Component; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -105,15 +108,6 @@ public class ItembasicController { return success(ItembasicConvert.INSTANCE.convert(itembasic)); } - @GetMapping("/list") - @Operation(summary = "获得物品基本信息列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") - public CommonResult> getItembasicList(@RequestParam("ids") Collection ids) { - List list = itembasicService.getItembasicList(ids); - return success(ItembasicConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得物品基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") @@ -149,21 +143,28 @@ public class ItembasicController { public void exportItembasicExcel(@Valid ItembasicExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = itembasicService.getItembasicList(exportReqVO); - // 导出 Excel - List datas = ItembasicConvert.INSTANCE.convertList02(list); - for(ItembasicExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, resultList, mapDropDown); + } + + @PostMapping("/export-excel-senior") + @Operation(summary = "导出物品基本信息 Excel") + @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") + @OperateLog(type = EXPORT) + public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = itembasicService.getItembasicList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] status = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_STATUS); mapDropDown.put(4, status); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(5, uom); String[] altUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(6, altUom); - mapDropDown.put(6, altUom); String[] isStdPack = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(7, isStdPack); String[] enableBuy = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); @@ -192,8 +193,16 @@ public class ItembasicController { mapDropDown.put(20, eqLevel); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(22, available); - ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = ItembasicConvert.INSTANCE.convertList02(list); + for(ItembasicExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入物品基本信息模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java index b3da0b68..5c96af81 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java @@ -8,10 +8,12 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.itembasic.vo.ItembasicRespVO; import com.win.module.wms.controller.itempackaging.vo.*; import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.itempackaging.ItempackagingConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.itempackaging.ItempackagingService; @@ -79,14 +81,14 @@ public class ItempackagingController { return success(ItempackagingConvert.INSTANCE.convert(itempackaging)); } - @GetMapping("/list") - @Operation(summary = "获得物品包装信息 列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") - public CommonResult> getItempackagingList(@RequestParam("ids") Collection ids) { - List list = itempackagingService.getItempackagingList(ids); - return success(ItempackagingConvert.INSTANCE.convertList(list)); - } +// @GetMapping("/list") +// @Operation(summary = "获得物品包装信息 列表") +// @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") +// @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") +// public CommonResult> getItempackagingList(@RequestParam("ids") Collection ids) { +// List list = itempackagingService.getItempackagingList(ids); +// return success(ItempackagingConvert.INSTANCE.convertList(list)); +// } @GetMapping("/page") @Operation(summary = "获得物品包装信息分页") @@ -122,14 +124,21 @@ public class ItempackagingController { public void exportItempackagingExcel(@Valid ItempackagingExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = itempackagingService.getItempackagingList(exportReqVO); - // 导出 Excel - List datas = ItempackagingConvert.INSTANCE.convertList02(list); - for(ItempackagingExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出物品包装信息 Excel") + @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") + @OperateLog(type = EXPORT) + public void exportItempackagingExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = itempackagingService.getItempackagingList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物品包装信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(1, uom); String[] description = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); @@ -144,9 +153,17 @@ public class ItempackagingController { mapDropDown.put(11, altPackUnit4);; String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(13, available);; - ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = ItempackagingConvert.INSTANCE.convertList02(list); + for(ItempackagingExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入物品包装信息模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java index a35f3aa7..bd119495 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java @@ -9,10 +9,13 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.location.vo.*; import com.win.module.wms.controller.locationgroup.vo.LocationgroupRespVO; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.location.LocationConvert; import com.win.module.wms.convert.locationgroup.LocationgroupConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; @@ -140,14 +143,21 @@ public class LocationController { public void exportLocationExcel(@Valid LocationExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = locationService.getLocationList(exportReqVO); - // 导出 Excel - List datas = LocationConvert.INSTANCE.convertList02(list); - for(LocationExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "库位.xlsx", "数据", LocationExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出库位 Excel") + @PreAuthorize("@ss.hasPermission('wms:location:export')") + @OperateLog(type = EXPORT) + public void exportLocationExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = locationService.getLocationList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "库位.xlsx", "数据", LocationExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE); mapDropDown.put(3, warehouseCode); String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE); @@ -158,8 +168,16 @@ public class LocationController { mapDropDown.put(7, type); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(18, available);; - ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList =LocationConvert.INSTANCE.convertList02(list); + for(LocationExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入库位模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java index 53a2e3bf..04d58aaa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java @@ -9,9 +9,12 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.areabasic.vo.AreabasicRespVO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.locationgroup.vo.*; import com.win.module.wms.convert.areabasic.AreabasicConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.locationgroup.LocationgroupConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.locationgroup.LocationgroupService; @@ -121,22 +124,37 @@ public class LocationgroupController { public void exportLocationgroupExcel(@Valid LocationgroupExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = locationgroupService.getLocationgroupList(exportReqVO); - // 导出 Excel - List datas = LocationgroupConvert.INSTANCE.convertList02(list); - for(LocationgroupExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "库位组.xlsx", "数据", LocationgroupExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出库位组 Excel") + @PreAuthorize("@ss.hasPermission('wms:locationgroup:export')") + @OperateLog(type = EXPORT) + public void exportLocationgroupExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = locationgroupService.getLocationgroupList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "库位组.xlsx", "数据", LocationgroupExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE); mapDropDown.put(3, warehouseCode); String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE); mapDropDown.put(4, areaCode); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); mapDropDown.put(5, available);; - ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = LocationgroupConvert.INSTANCE.convertList02(list); + for(LocationgroupExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入库位组模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java index 10b4a11e..8d83d41c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java @@ -8,10 +8,13 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.process.vo.*; import com.win.module.wms.controller.workstation.vo.WorkstationRespVO; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.process.ProcessConvert; import com.win.module.wms.convert.workstation.WorkstationConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.process.ProcessDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.process.ProcessService; @@ -80,14 +83,6 @@ public class ProcessController { return success(ProcessConvert.INSTANCE.convert(process)); } - @GetMapping("/list") - @Operation(summary = "获得工序列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:process:query')") - public CommonResult> getProcessList(@RequestParam("ids") Collection ids) { - List list = processService.getProcessList(ids); - return success(ProcessConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得工序分页") @@ -110,15 +105,31 @@ public class ProcessController { public void exportProcessExcel(@Valid ProcessExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = processService.getProcessList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "工序.xlsx", "数据", ProcessExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出工序 Excel") + @PreAuthorize("@ss.hasPermission('wms:process:export')") + @OperateLog(type = EXPORT) + public void exportProcessExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = processService.getProcessList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "工序.xlsx", "数据", ProcessExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { // 导出 Excel - List datas = ProcessConvert.INSTANCE.convertList02(list); - for(ProcessExcelVO vo : datas) { + List resultList = ProcessConvert.INSTANCE.convertList02(list); + for(ProcessExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "工序.xls", "数据", ProcessExcelVO.class, datas); + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入参数设置模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java index d7630f7a..9dacbfb3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java @@ -8,10 +8,13 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.productionline.vo.*; import com.win.module.wms.controller.workshop.vo.WorkshopRespVO; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.productionline.ProductionlineConvert; import com.win.module.wms.convert.workshop.WorkshopConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.productionline.ProductionlineService; @@ -79,14 +82,6 @@ public class ProductionlineController { return success(ProductionlineConvert.INSTANCE.convert(productionline)); } - @GetMapping("/list") - @Operation(summary = "获得生产线列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:productionline:query')") - public CommonResult> getProductionlineList(@RequestParam("ids") Collection ids) { - List list = productionlineService.getProductionlineList(ids); - return success(ProductionlineConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得生产线分页") @@ -109,15 +104,31 @@ public class ProductionlineController { public void exportProductionlineExcel(@Valid ProductionlineExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = productionlineService.getProductionlineList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "生产线.xlsx", "数据", ProductionlineExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出生产线 Excel") + @PreAuthorize("@ss.hasPermission('wms:productionline:export')") + @OperateLog(type = EXPORT) + public void exportProductionlineExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = productionlineService.getProductionlineList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "生产线.xlsx", "数据", ProductionlineExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { // 导出 Excel - List datas = ProductionlineConvert.INSTANCE.convertList02(list); - for(ProductionlineExcelVO vo : datas) { + List resultList = ProductionlineConvert.INSTANCE.convertList02(list); + for(ProductionlineExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "生产线.xls", "数据", ProductionlineExcelVO.class, datas); + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入参数设置模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java index d081e576..d09759fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java @@ -8,8 +8,11 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.productionlineitem.vo.*; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.productionlineitem.ProductionlineitemConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.productionlineitem.ProductionlineitemService; @@ -78,15 +81,6 @@ public class ProductionlineitemController { return success(ProductionlineitemConvert.INSTANCE.convert(productionlineitem)); } - @GetMapping("/list") - @Operation(summary = "获得生产线物料关系列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:productionlineitem:query')") - public CommonResult> getProductionlineitemList(@RequestParam("ids") Collection ids) { - List list = productionlineitemService.getProductionlineitemList(ids); - return success(ProductionlineitemConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得生产线物料关系分页") @PreAuthorize("@ss.hasPermission('wms:productionlineitem:query')") @@ -102,14 +96,29 @@ public class ProductionlineitemController { public void exportProductionlineitemExcel(@Valid ProductionlineitemExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = productionlineitemService.getProductionlineitemList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "生产线物料关系.xlsx", "数据", ProductionlineitemExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出生产线物料关系 Excel") + @PreAuthorize("@ss.hasPermission('wms:productionlineitem:export')") + @OperateLog(type = EXPORT) + public void exportProductionlineitemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = productionlineitemService.getProductionlineitemList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "生产线物料关系.xlsx", "数据", ProductionlineitemExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { // 导出 Excel - List datas = ProductionlineitemConvert.INSTANCE.convertList02(list); - for(ProductionlineitemExcelVO vo : datas) { + List resultList = ProductionlineitemConvert.INSTANCE.convertList02(list); + for(ProductionlineitemExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "生产线物料关系.xls", "数据", ProductionlineitemExcelVO.class, datas); + return resultList; } @GetMapping("/get-import-template") @Operation(summary = "获得导入生产线物料关系模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportExcelVO.java index 773b15d0..0a46b727 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportExcelVO.java @@ -23,6 +23,9 @@ public class ProductionlineItemImportExcelVO { @ExcelProperty("完工收货库位") private String fgLocationCode; + @ExcelProperty("原料库位") + private String rawLocationCode; + @ExcelProperty("产线代码") private String productionLineCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExcelVO.java index 87ee6df3..abff5450 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExcelVO.java @@ -20,6 +20,9 @@ public class ProductionlineitemExcelVO { @ExcelProperty("完工收货库位") private String fgLocationCode; + @ExcelProperty("原料库位") + private String rawLocationCode; + @ExcelProperty("产线代码") private String productionLineCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java index f01180bc..12f9c075 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java @@ -113,4 +113,6 @@ public class ProductreceiptRequestDetailBaseVO { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "到库位代码") + private String toLocationCode; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java index 040852c7..c4209496 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java @@ -9,9 +9,12 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customeritem.vo.CustomeritemRespVO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.project.vo.*; import com.win.module.wms.convert.customeritem.CustomeritemConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.project.ProjectConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.project.ProjectDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.project.ProjectService; @@ -91,14 +94,6 @@ public class ProjectController { } return success(result); } - @GetMapping("/list") - @Operation(summary = "获得项目列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:project:query')") - public CommonResult> getProjectList(@RequestParam("ids") Collection ids) { - List list = projectService.getProjectList(ids); - return success(ProjectConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得项目分页") @@ -121,15 +116,32 @@ public class ProjectController { public void exportProjectExcel(@Valid ProjectExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = projectService.getProjectList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "项目.xlsx", "数据",ProjectExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出项目 Excel") + @PreAuthorize("@ss.hasPermission('wms:project:export')") + @OperateLog(type = EXPORT) + public void exportProjectExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = projectService.getProjectList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "项目.xlsx", "数据",ProjectExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { + // 导出 Excel - List datas = ProjectConvert.INSTANCE.convertList02(list); - for(ProjectExcelVO vo : datas) { + List resultList = ProjectConvert.INSTANCE.convertList02(list); + for(ProjectExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "项目.xls", "数据", ProjectExcelVO.class, datas); + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入参数设置模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java index 8ad6553e..ae1e3e7f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java @@ -48,6 +48,10 @@ public class PurchaseDetailBaseVO { @NotNull(message = "转换率不能为空") private BigDecimal convertRate; + @Schema(description = "已计划数量", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "已计划数量不能为空") + private BigDecimal plannedQty; + @Schema(description = "已发货数量", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "已发货数量不能为空") private BigDecimal shippedQty; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExcelVO.java index 01c40a58..81bd6fc4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExcelVO.java @@ -56,6 +56,9 @@ public class PurchaseDetailExcelVO { @ExcelProperty("转换率") private BigDecimal convertRate; + @ExcelProperty("已计划数量") + private BigDecimal plannedQty; + @ExcelProperty("已发货数量") private BigDecimal shippedQty; @@ -108,6 +111,7 @@ public class PurchaseDetailExcelVO { @ExcelProperty("并发乐观锁") private String concurrencyStamp; + @ExcelProperty(value = "明细状态", converter = DictConvert.class) @DictFormat("purchase_order_detail_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String status; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java index 7bc55c69..5f6a6882 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java @@ -98,4 +98,7 @@ public class PurchaseDetailExportReqVO { @Schema(description = "是否可用") private String available; + @Schema(description = "已计划数量") + private BigDecimal plannedQty; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java index 429cb702..80b2cbb6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java @@ -100,4 +100,6 @@ public class PurchaseDetailPageReqVO extends PageParam { @Schema(description = "是否可用") private String available; + @Schema(description = "已计划数量") + private BigDecimal plannedQty; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java index e488d4dc..7f07bccd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java @@ -8,10 +8,13 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.purchaseprice.vo.*; import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceRespVO; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.purchaseprice.PurchasepriceConvert; import com.win.module.wms.convert.stdcostprice.StdcostpriceConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.purchaseprice.PurchasepriceDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.purchaseprice.PurchasepriceService; @@ -91,14 +94,6 @@ public class PurchasepriceController { return success(PurchasepriceConvert.INSTANCE.convert(purchaseprice)); } - @GetMapping("/list") - @Operation(summary = "获得采购价格单列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:purchaseprice:query')") - public CommonResult> getPurchasepriceList(@RequestParam("ids") Collection ids) { - List list = purchasepriceService.getPurchasepriceList(ids); - return success(PurchasepriceConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得采购价格单分页") @@ -121,18 +116,33 @@ public class PurchasepriceController { public void exportPurchasepriceExcel(@Valid PurchasepriceExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = purchasepriceService.getPurchasepriceList(exportReqVO); - // 导出 Excel - List datas = PurchasepriceConvert.INSTANCE.convertList02(list); - for(PurchasepriceExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "采购价格单.xlsx", "数据",PurchasepriceExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出采购价格单 Excel") + @PreAuthorize("@ss.hasPermission('wms:purchaseprice:export')") + @OperateLog(type = EXPORT) + public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = purchasepriceService.getPurchasepriceList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "采购价格单.xlsx", "数据",PurchasepriceExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); mapDropDown.put(2, currency); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(4, available); - ExcelUtils.write(response, "采购价格单.xls", "数据", PurchasepriceExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = PurchasepriceConvert.INSTANCE.convertList02(list); + for(PurchasepriceExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } @GetMapping("/get-import-template") @Operation(summary = "获得导入采购价格单模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java index 9131cd7a..7bcbd436 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java @@ -11,7 +11,6 @@ import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailCon import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -34,15 +33,6 @@ public class PurchasereceiptJobDetailController { @Resource private AdminUserApi userApi; - @GetMapping("/get") - @Operation(summary = "获得采购收货任务子") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')") - public CommonResult getPurchasereceiptJobDetail(@RequestParam("id") Long id) { - PurchasereceiptJobDetailDO purchasereceiptJobDetail = purchasereceiptJobDetailService.getPurchasereceiptJobDetail(id); - return success(PurchasereceiptJobDetailConvert.INSTANCE.convert(purchasereceiptJobDetail)); - } - @PostMapping("/senior") @Operation(summary = "高级搜索获得采购收货任务子信息分页") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index 585ffc02..42365120 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java @@ -176,16 +176,16 @@ public class PurchasereceiptJobMainController { @Operation(summary = "承接任务") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:accept')") @PostMapping(value = "/accept/{id}") - public CommonResult accept(@PathVariable("id") Long id) { - int result = purchasereceiptJobMainService.accept(id); + public CommonResult acceptPurchasereceiptJobMain(@PathVariable("id") Long id) { + int result = purchasereceiptJobMainService.acceptPurchasereceiptJobMain(id); return success(result > 0); } @Operation(summary = "取消承接任务") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:cancel-accept')") @PostMapping(value = "/cancelAccept/{id}") - public CommonResult cancelAccept(@PathVariable("id") Long id) { - int result = purchasereceiptJobMainService.cancelAccept(id); + public CommonResult cancelAcceptPurchasereceiptJobMain(@PathVariable("id") Long id) { + int result = purchasereceiptJobMainService.cancelAcceptPurchasereceiptJobMain(id); return success(result > 0); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java index 64165100..446891b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java @@ -11,7 +11,6 @@ import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDet import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordDetailService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -19,8 +18,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import java.util.Collection; -import java.util.List; import static com.win.framework.common.pojo.CommonResult.success; @@ -36,24 +33,6 @@ public class PurchasereceiptRecordDetailController { @Resource private AdminUserApi userApi; - @GetMapping("/get") - @Operation(summary = "获得采购收货记录子") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')") - public CommonResult getPurchasereceiptRecordDetail(@RequestParam("id") Long id) { - PurchasereceiptRecordDetailDO purchasereceiptRecordDetail = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetail(id); - return success(PurchasereceiptRecordDetailConvert.INSTANCE.convert(purchasereceiptRecordDetail)); - } - - @GetMapping("/list") - @Operation(summary = "获得采购收货记录子列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')") - public CommonResult> getPurchasereceiptRecordDetailList(@RequestParam("ids") Collection ids) { - List list = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailList(ids); - return success(PurchasereceiptRecordDetailConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得采购收货记录子分页") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExportReqVO.java index 3e5da6c2..9509bc95 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExportReqVO.java @@ -59,10 +59,10 @@ public class PurchaseshortageDetailExportReqVO { private String toLocationGroupCode; @Schema(description = "从库区代码") - private String fromAreaCodes; + private String fromAreaCode; @Schema(description = "到库区代码") - private String toAreaCodes; + private String toAreaCode; @Schema(description = "订单号") private String poNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailPageReqVO.java index f0313d74..8463a4d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailPageReqVO.java @@ -64,10 +64,10 @@ public class PurchaseshortageDetailPageReqVO extends PageParam { private String toLocationGroupCode; @Schema(description = "从库区代码") - private String fromAreaCodes; + private String fromAreaCode; @Schema(description = "到库区代码") - private String toAreaCodes; + private String toAreaCode; @Schema(description = "订单号") private String poNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java index 52e27cb5..5e793c6b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java @@ -61,8 +61,8 @@ public class PurchasereceiptRequestDetailController { @Operation(summary = "更新采购收货申请子") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:update')") public CommonResult updatePurchasereceiptRequestDetail(@Valid @RequestBody PurchasereceiptRequestDetailUpdateReqVO updateReqVO) { - purchasereceiptRequestDetailService.updatePurchasereceiptRequestDetail(updateReqVO); - return success(true); + int result = purchasereceiptRequestDetailService.updatePurchasereceiptRequestDetail(updateReqVO); + return success(result > 0); } @DeleteMapping("/delete") @@ -70,8 +70,8 @@ public class PurchasereceiptRequestDetailController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:delete')") public CommonResult deletePurchasereceiptRequestDetail(@RequestParam("id") Long id) { - purchasereceiptRequestDetailService.deletePurchasereceiptRequestDetail(id); - return success(true); + int result = purchasereceiptRequestDetailService.deletePurchasereceiptRequestDetail(id); + return success(result > 0); } @GetMapping("/get") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java index ca072e2e..c876f5f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java @@ -127,7 +127,7 @@ public class PurchasereceiptRequestMainController { ExcelUtils.write(response, "采购收货申请主.xlsx", "数据", PurchasereceiptRequestMainExcelVO.class, resultList, mapDropDown); } - @GetMapping("/export-excel-senior") + @PostMapping("/export-excel-senior") @Operation(summary = "导出采购收货申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:export')") @OperateLog(type = EXPORT) @@ -161,11 +161,14 @@ public class PurchasereceiptRequestMainController { List subList = purchasereceiptRequestDetailService.selectList(mainDO.getId()); for(PurchasereceiptRequestDetailDO detailDO : subList) { PurchasereceiptRequestMainExcelVO vo = PurchasereceiptRequestMainConvert.INSTANCE.convert(mainDO, detailDO); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator())); + vo.setCreator(user.getNickname()); resultList.add(vo); } } return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入采购收货申请信息模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java index 106dd441..99943a49 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java @@ -31,7 +31,7 @@ public class PurchasereceiptRequestMainExcelVO { private String carrierCode; @ExcelProperty(value = "运输方式", converter = DictConvert.class) - @DictFormat(DictTypeConstants.TRANSFER_MODE) // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRANSFER_MODE) private String transferMode; @ExcelProperty("从仓库代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java index eba552c1..0463ef34 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java @@ -8,11 +8,14 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.project.vo.ProjectRespVO; import com.win.module.wms.controller.saleprice.vo.*; import com.win.module.wms.controller.saleprice.vo.SalepriceImportExcelVo; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.project.ProjectConvert; import com.win.module.wms.convert.saleprice.SalepriceConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.saleprice.SalepriceService; @@ -81,14 +84,6 @@ public class SalepriceController { return success(SalepriceConvert.INSTANCE.convert(saleprice)); } - @GetMapping("/list") - @Operation(summary = "获得销售价格单列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:saleprice:query')") - public CommonResult> getSalepriceList(@RequestParam("ids") Collection ids) { - List list = salepriceService.getSalepriceList(ids); - return success(SalepriceConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得销售价格单分页") @@ -123,20 +118,35 @@ public class SalepriceController { public void exportSalepriceExcel(@Valid SalepriceExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = salepriceService.getSalepriceList(exportReqVO); - // 导出 Excel - List datas = SalepriceConvert.INSTANCE.convertList02(list); - for(SalepriceExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "销售价格单.xlsx", "数据", SalepriceExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出销售价格单 Excel") + @PreAuthorize("@ss.hasPermission('wms:saleprice:export')") + @OperateLog(type = EXPORT) + public void exportSalepriceExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list =salepriceService.getSalepriceList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "销售价格单.xlsx", "数据", SalepriceExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(4, available); String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); mapDropDown.put(2, currency); - ExcelUtils.write(response, "销售价格单.xls", "数据", SalepriceExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = SalepriceConvert.INSTANCE.convertList02(list); + for(SalepriceExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导销售价格单信息模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java index 95859a19..318ccf45 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java @@ -9,11 +9,14 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.bom.vo.BomRespVO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.stdcostprice.vo.*; import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceImportExcelVo; import com.win.module.wms.convert.bom.BomConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.stdcostprice.StdcostpriceConvert; import com.win.module.wms.dal.dataobject.bom.BomDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.stdcostprice.StdcostpriceService; @@ -82,14 +85,6 @@ public class StdcostpriceController { return success(StdcostpriceConvert.INSTANCE.convert(stdcostprice)); } - @GetMapping("/list") - @Operation(summary = "获得标准成本价格单列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:stdcostprice:query')") - public CommonResult> getStdcostpriceList(@RequestParam("ids") Collection ids) { - List list = stdcostpriceService.getStdcostpriceList(ids); - return success(StdcostpriceConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得标准成本价格单分页") @@ -126,18 +121,33 @@ public class StdcostpriceController { public void exportStdcostpriceExcel(@Valid StdcostpriceExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = stdcostpriceService.getStdcostpriceList(exportReqVO); - // 导出 Excel - List datas = StdcostpriceConvert.INSTANCE.convertList02(list); - for(StdcostpriceExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "标准成本价格单.xlsx", "数据", StdcostpriceExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出标准成本价格单 Excel") + @PreAuthorize("@ss.hasPermission('wms:stdcostprice:export')") + @OperateLog(type = EXPORT) + public void exportStdcostpriceExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = stdcostpriceService.getStdcostpriceList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "标准成本价格单.xlsx", "数据", StdcostpriceExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(4, available); String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); mapDropDown.put(2, currency); - ExcelUtils.write(response, "标准成本价格单.xls", "数据", StdcostpriceExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = StdcostpriceConvert.INSTANCE.convertList02(list); + for(StdcostpriceExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } @GetMapping("/get-import-template") @Operation(summary = "获得导入标准成本价格单信息模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java index 572f6284..712362d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java @@ -8,10 +8,13 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO; import com.win.module.wms.controller.supplier.vo.*; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.itempackaging.ItempackagingConvert; import com.win.module.wms.convert.supplier.SupplierConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.supplier.SupplierService; @@ -121,20 +124,35 @@ public class SupplierController { public void exportSupplierExcel(@Valid SupplierExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = supplierService.getSupplierList(exportReqVO); - // 导出 Excel - List datas = SupplierConvert.INSTANCE.convertList02(list); - for(SupplierExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "供应商.xlsx", "数据", SupplierExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出供应商 Excel") + @PreAuthorize("@ss.hasPermission('wms:supplier:export')") + @OperateLog(type = EXPORT) + public void exportSupplierExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = supplierService.getSupplierList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "供应商.xlsx", "数据", SupplierExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); mapDropDown.put(11, currency); String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SUPPLIER_TYPE); mapDropDown.put(13, type); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(14, available); - ExcelUtils.write(response, "供应商.xls", "数据", SupplierExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = SupplierConvert.INSTANCE.convertList02(list); + for(SupplierExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } @GetMapping("/get-import-template") @Operation(summary = "获得导入供应商模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java index c20ea0bf..13b3f2d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java @@ -3,7 +3,17 @@ package com.win.module.wms.controller.supplierdeliverRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExcelVO; +import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; +import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainRespVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.*; +import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; +import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert; +import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordDetailConvert; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -34,6 +44,8 @@ public class SupplierdeliverRecordMainController { @Resource private SupplierdeliverRecordMainService supplierdeliverRecordMainService; + @Resource + private SupplierdeliverRecordDetailService supplierdeliverRecordDetailService; @Resource private AdminUserApi userApi; @@ -112,4 +124,22 @@ public class SupplierdeliverRecordMainController { ExcelUtils.write(response, "供应商发货记录主.xls", "数据", SupplierdeliverRecordMainExcelVO.class, datas); } + @GetMapping("/getSupplierdeliverRecordById") + @Operation(summary = "APP获得供应商发货记录主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:query')") + public CommonResult getSupplierdeliverRecordById(@RequestParam("id") Long id) { + SupplierdeliverRecordMainDO supplierdeliverRecordMain = supplierdeliverRecordMainService.getSupplierdeliverRecordMain(id); + SupplierdeliverRecordMainRespVO result = SupplierdeliverRecordMainConvert.INSTANCE.convert(supplierdeliverRecordMain); + if(result==null) { + return success(result); + }; + SupplierdeliverRecordDetailExportReqVO reqVO = new SupplierdeliverRecordDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List list = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetailList(reqVO); + List vos = SupplierdeliverRecordDetailConvert.INSTANCE.convertList02(list); + result.setSubList(vos); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java index 261605fd..83af28a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java @@ -130,4 +130,7 @@ public class SupplierdeliverRecordDetailExportReqVO { @Schema(description = "到批次") private String toBatch; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainRespVO.java index 66cb2637..bc8fbd11 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.supplierdeliverRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.util.List; + @Schema(description = "管理后台 - 供应商发货记录主 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class SupplierdeliverRecordMainRespVO extends SupplierdeliverRecordMainBaseVO { + @Schema(description = "供应商发货记录子表record_supplierdeliver_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java index 30f590f8..16161978 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java @@ -27,12 +27,6 @@ public class SupplierdeliverRequestDetailBaseVO { @Schema(description = "id", example = "id") private Long id; - @Schema(description = "包装号") - private String packingNumber; - - @Schema(description = "器具号") - private String containerNumber; - @Schema(description = "批次") private String batch; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExcelVO.java index 62ef4214..60a07039 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExcelVO.java @@ -26,12 +26,6 @@ import com.win.framework.excel.core.convert.DictConvert; @Data public class SupplierdeliverRequestDetailExcelVO { - @ExcelProperty("包装号") - private String packingNumber; - - @ExcelProperty("器具号") - private String containerNumber; - @ExcelProperty("批次") private String batch; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExportReqVO.java index 9ff3a4b0..a5ad473e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExportReqVO.java @@ -15,12 +15,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @Data public class SupplierdeliverRequestDetailExportReqVO { - @Schema(description = "包装号") - private String packingNumber; - - @Schema(description = "器具号") - private String containerNumber; - @Schema(description = "批次") private String batch; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java index 6c235d5e..45bb56ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java @@ -17,12 +17,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @ToString(callSuper = true) public class SupplierdeliverRequestDetailPageReqVO extends PageParam { - @Schema(description = "包装号") - private String packingNumber; - - @Schema(description = "器具号") - private String containerNumber; - @Schema(description = "批次") private String batch; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailBaseVO.java index acecea97..bf5fe792 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailBaseVO.java @@ -30,20 +30,6 @@ public class SupplierinvoiceRequestDetailBaseVO { @Schema(description = "货主代码") private String ownerCode; - @Schema(description = "包装号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "包装号不能为空") - private String packingNumber; - - @Schema(description = "器具号") - private String containerNumber; - - @Schema(description = "批次", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "批次不能为空") - private String batch; - - @Schema(description = "替代批次") - private String altBatch; - @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "订单号不能为空") private String poNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExcelVO.java index 9deba52c..d90dd170 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExcelVO.java @@ -29,18 +29,6 @@ public class SupplierinvoiceRequestDetailExcelVO { @ExcelProperty("货主代码") private String ownerCode; - @ExcelProperty("包装号") - private String packingNumber; - - @ExcelProperty("器具号") - private String containerNumber; - - @ExcelProperty("批次") - private String batch; - - @ExcelProperty("替代批次") - private String altBatch; - @ExcelProperty("订单号") private String poNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExportReqVO.java index 2f9821ac..024abca4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExportReqVO.java @@ -21,18 +21,6 @@ public class SupplierinvoiceRequestDetailExportReqVO { @Schema(description = "货主代码") private String ownerCode; - @Schema(description = "包装号") - private String packingNumber; - - @Schema(description = "器具号") - private String containerNumber; - - @Schema(description = "批次") - private String batch; - - @Schema(description = "替代批次") - private String altBatch; - @Schema(description = "订单号") private String poNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailPageReqVO.java index ea82f17d..e47d64f8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailPageReqVO.java @@ -23,18 +23,6 @@ public class SupplierinvoiceRequestDetailPageReqVO extends PageParam { @Schema(description = "货主代码") private String ownerCode; - @Schema(description = "包装号") - private String packingNumber; - - @Schema(description = "器具号") - private String containerNumber; - - @Schema(description = "批次") - private String batch; - - @Schema(description = "替代批次") - private String altBatch; - @Schema(description = "订单号") private String poNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java index c0d2b832..e0d9515b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java @@ -8,10 +8,13 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.purchaseprice.vo.PurchasepriceRespVO; import com.win.module.wms.controller.supplieritem.vo.*; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.purchaseprice.PurchasepriceConvert; import com.win.module.wms.convert.supplieritem.SupplieritemConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.supplieritem.SupplieritemService; @@ -80,14 +83,6 @@ public class SupplieritemController { return success(SupplieritemConvert.INSTANCE.convert(supplieritem)); } - @GetMapping("/list") - @Operation(summary = "获得供应商物品列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:supplieritem:query')") - public CommonResult> getSupplieritemList(@RequestParam("ids") Collection ids) { - List list = supplieritemService.getSupplieritemList(ids); - return success(SupplieritemConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得供应商物品分页") @@ -123,13 +118,21 @@ public class SupplieritemController { public void exportSupplieritemExcel(@Valid SupplieritemExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = supplieritemService.getSupplieritemList(exportReqVO); - // 导出 Excel - List datas = SupplieritemConvert.INSTANCE.convertList02(list); - for(SupplieritemExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "供应商物品.xlsx", "数据", SupplieritemExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出供应商物品 Excel") + @PreAuthorize("@ss.hasPermission('wms:supplieritem:export')") + @OperateLog(type = EXPORT) + public void exportSupplieritemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = supplieritemService.getSupplieritemList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "供应商物品.xlsx", "数据", SupplieritemExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(13, available); String[] supplierUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); @@ -140,9 +143,15 @@ public class SupplieritemController { mapDropDown.put(7, altPackUnit); String[] settlementType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SETTLEMENT_TYPE); mapDropDown.put(12, settlementType); - ExcelUtils.write(response, "供应商物品.xls", "数据", SupplieritemExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = SupplieritemConvert.INSTANCE.convertList02(list); + for(SupplieritemExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } - @GetMapping("/get-import-template") @Operation(summary = "获得导入供应商物品信息模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java index 274efd62..01da58b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java @@ -8,11 +8,14 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO;; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.process.vo.ProcessRespVO; import com.win.module.wms.controller.systemcalendar.vo.*; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarImportExcelVo; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.process.ProcessConvert; import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.systemcalendar.SystemcalendarDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.systemcalendar.SystemcalendarService; @@ -79,14 +82,6 @@ public class SystemcalendarController { return success(SystemcalendarConvert.INSTANCE.convert(systemcalendar)); } - @GetMapping("/list") - @Operation(summary = "获得系统日历列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:systemcalendar:query')") - public CommonResult> getSystemcalendarList(@RequestParam("ids") Collection ids) { - List list = systemcalendarService.getSystemcalendarList(ids); - return success(SystemcalendarConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得系统日历分页") @@ -121,17 +116,33 @@ public class SystemcalendarController { public void exportSystemcalendarExcel(@Valid SystemcalendarExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = systemcalendarService.getSystemcalendarList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "系统日历.xlsx", "数据", SystemcalendarExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出系统日历 Excel") + @PreAuthorize("@ss.hasPermission('wms:systemcalendar:export')") + @OperateLog(type = EXPORT) + public void exportSystemcalendarExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = systemcalendarService.getSystemcalendarList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "系统日历.xlsx", "数据", SystemcalendarExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(3, available); // 导出 Excel - List datas = SystemcalendarConvert.INSTANCE.convertList02(list); - for(SystemcalendarExcelVO vo : datas) { + List resultList = SystemcalendarConvert.INSTANCE.convertList02(list); + for(SystemcalendarExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); - String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(3, available); - ExcelUtils.write(response, "系统日历.xls", "数据", SystemcalendarExcelVO.class, datas,mapDropDown); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入班组信息模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java index d83492c6..e529d700 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java @@ -49,7 +49,7 @@ public class TransactionController { @Operation(summary = "创建库存事务并增加库存转运日志") @PreAuthorize("@ss.hasPermission('wms:transaction:create')") public CommonResult createTransactionAndTransferLog(@Valid @RequestBody TransactionCreateReqListVO transactionCreateReqListVO) { - return success(transactionService.createTransaction(transactionCreateReqListVO.getTransactionList(), transactionCreateReqListVO.getTransferlogList())); + return success(transactionService.createTransactionAndTransferlog(transactionCreateReqListVO.getTransactionList(), transactionCreateReqListVO.getTransferlogList())); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java index 013339f3..a90cb9ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java @@ -10,12 +10,15 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customer.vo.CustomerRespVO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO; import com.win.module.wms.controller.warehouse.vo.*; import com.win.module.wms.convert.customer.CustomerConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.warehouse.WarehouseConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper; import com.win.module.wms.enums.DictTypeConstants; @@ -115,20 +118,35 @@ public class WarehouseController { public void exportWarehouseExcel(@Valid WarehouseExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = warehouseService.getWarehouseList(exportReqVO); - // 导出 Excel - List datas = WarehouseConvert.INSTANCE.convertList02(list); - for(WarehouseExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "仓库.xlsx", "数据", WarehouseExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出仓库 Excel") + @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") + @OperateLog(type = EXPORT) + public void exportWarehouseExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = warehouseService.getWarehouseList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "仓库.xlsx", "数据", WarehouseExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(4, available); String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE); mapDropDown.put(3, type); - ExcelUtils.write(response, "仓库.xls", "数据", WarehouseExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = WarehouseConvert.INSTANCE.convertList02(list); + for(WarehouseExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入仓库信息模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java index d2aeab62..dd26d402 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java @@ -8,12 +8,15 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.location.vo.LocationRespVO; import com.win.module.wms.controller.workshop.vo.WorkshopRespVO; import com.win.module.wms.controller.workshop.vo.*; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.location.LocationConvert; import com.win.module.wms.convert.workshop.WorkshopConvert; import com.win.module.wms.convert.workshop.WorkshopConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.enums.DictTypeConstants; @@ -83,15 +86,6 @@ public class WorkshopController { return success(WorkshopConvert.INSTANCE.convert(workshop)); } - @GetMapping("/list") - @Operation(summary = "获得车间列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:workshop:query')") - public CommonResult> getWorkshopList(@RequestParam("ids") Collection ids) { - List list = workshopService.getWorkshopList(ids); - return success(WorkshopConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得车间分页") @PreAuthorize("@ss.hasPermission('wms:workshop:query')") @@ -113,19 +107,33 @@ public class WorkshopController { public void exportWorkshopExcel(@Valid WorkshopExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = workshopService.getWorkshopList(exportReqVO); - // 导出 Excel - List datas = WorkshopConvert.INSTANCE.convertList02(list); - for(WorkshopExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "车间.xlsx", "数据", WorkshopExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出车间 Excel") + @PreAuthorize("@ss.hasPermission('wms:workshop:export')") + @OperateLog(type = EXPORT) + public void exportWorkshopExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = workshopService.getWorkshopList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "车间.xlsx", "数据", WorkshopExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(4, available); String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORKSHOP_TYPE); mapDropDown.put(3, type); - ExcelUtils.write(response, "车间.xls", "数据", WorkshopExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = WorkshopConvert.INSTANCE.convertList02(list); + for(WorkshopExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java index 076d5d31..74c09cde 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java @@ -8,11 +8,14 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.productionline.vo.ProductionlineRespVO; import com.win.module.wms.controller.workstation.vo.WorkstationRespVO; import com.win.module.wms.controller.workstation.vo.*; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.productionline.ProductionlineConvert; import com.win.module.wms.convert.workstation.WorkstationConvert;; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.workstation.WorkstationService; @@ -79,14 +82,6 @@ public class WorkstationController { return success(WorkstationConvert.INSTANCE.convert(workstation)); } - @GetMapping("/list") - @Operation(summary = "获得工位列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:workstation:query')") - public CommonResult> getWorkstationList(@RequestParam("ids") Collection ids) { - List list = workstationService.getWorkstationList(ids); - return success(WorkstationConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得工位分页") @@ -123,19 +118,33 @@ public class WorkstationController { public void exportWorkstationExcel(@Valid WorkstationExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = workstationService.getWorkstationList(exportReqVO); - // 导出 Excel - List datas = WorkstationConvert.INSTANCE.convertList02(list); - for(WorkstationExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "工位.xlsx", "数据", WorkstationExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出工位 Excel") + @PreAuthorize("@ss.hasPermission('wms:workstation:export')") + @OperateLog(type = EXPORT) + public void exportWorkstationExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = workstationService.getWorkstationList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "工位.xlsx", "数据", WorkstationExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORK_STATION_TYPE); mapDropDown.put(3, type); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(10, available); - ExcelUtils.write(response, "工位.xls", "数据", WorkstationExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = WorkstationConvert.INSTANCE.convertList02(list); + for(WorkstationExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationExcelVO.java index 57f1d94c..33434be2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationExcelVO.java @@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import com.win.module.wms.enums.DictTypeConstants; import lombok.Data; import java.time.LocalDateTime; @@ -27,7 +28,7 @@ public class WorkstationExcelVO { private String description; @ExcelProperty(value = "类型", converter = DictConvert.class) - @DictFormat("work_station_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.WORK_STATION_TYPE) private String type; @ExcelProperty("车间代码") @@ -43,8 +44,8 @@ public class WorkstationExcelVO { private String fgLocationCode; @ExcelProperty(value = "是否可用", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 - private Integer available; + @DictFormat(DictTypeConstants.TRUE_FALSE) + private String available; @ExcelProperty("生效时间") @ColumnWidth(value = 16) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectin/ExpectinConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectin/ExpectinConvert.java index 5dcb0da6..7aca6811 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectin/ExpectinConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectin/ExpectinConvert.java @@ -1,16 +1,15 @@ package com.win.module.wms.convert.expectin; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinExcelVO; import com.win.module.wms.controller.expectin.vo.ExpectinRespVO; import com.win.module.wms.controller.expectin.vo.ExpectinUpdateReqVO; +import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; + +import java.util.List; /** * 预计入库存 Convert @@ -34,4 +33,5 @@ public interface ExpectinConvert { List convertList02(List list); + List convertList03(List list); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectout/ExpectoutConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectout/ExpectoutConvert.java index 92f93a16..72795111 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectout/ExpectoutConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectout/ExpectoutConvert.java @@ -1,16 +1,15 @@ package com.win.module.wms.convert.expectout; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutExcelVO; import com.win.module.wms.controller.expectout.vo.ExpectoutRespVO; import com.win.module.wms.controller.expectout.vo.ExpectoutUpdateReqVO; +import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; + +import java.util.List; /** * 预计出库存 Convert @@ -34,4 +33,5 @@ public interface ExpectoutConvert { List convertList02(List list); + List convertList03(List list); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobDetailConvert.java index 6e09a605..d4efed54 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobDetailConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobDetailConvert.java @@ -1,16 +1,16 @@ package com.win.module.wms.convert.inspectJob; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExcelVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailRespVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; + +import java.util.List; /** * 检验任务子 Convert @@ -34,4 +34,6 @@ public interface InspectJobDetailConvert { List convertList02(List list); + InspectJobDetailDO convert(InspectRequestDetailDO bean); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java index bdb5a7be..8f3793c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java @@ -1,16 +1,19 @@ package com.win.module.wms.convert.inspectJob; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExcelVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; + +import java.util.List; /** * 检验任务主 Convert @@ -34,4 +37,18 @@ public interface InspectJobMainConvert { List convertList02(List list); + InspectJobMainDO convert(InspectRequestMainDO bean); + + @Mappings({ + @Mapping(source = "mainDO.number", target = "number"), + @Mapping(source = "detailDO.itemCode", target = "itemCode"), + @Mapping(source = "detailDO.uom", target = "uom"), + @Mapping(source = "mainDO.remark", target = "remark"), + @Mapping(source = "mainDO.createTime", target = "createTime"), + @Mapping(source = "mainDO.creator", target = "creator"), + @Mapping(source = "mainDO.updateTime", target = "updateTime"), + @Mapping(source = "mainDO.updater", target = "updater"), + }) + InspectJobMainExcelVO convert(InspectJobMainDO mainDO, InspectJobDetailDO detailDO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java index 3e2171ee..f16f5434 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java @@ -1,16 +1,18 @@ package com.win.module.wms.convert.inspectRecord; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExcelVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainRespVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; +import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO; + +import java.util.List; /** * 检验记录主 Convert @@ -34,4 +36,17 @@ public interface InspectRecordMainConvert { List convertList02(List list); + @Mappings({ + @Mapping(source = "mainDO.number", target = "number"), + @Mapping(source = "detailDO.itemCode", target = "itemCode"), + @Mapping(source = "detailDO.sampleQty", target = "sampleQty"), + @Mapping(source = "detailDO.uom", target = "uom"), + @Mapping(source = "detailDO.code", target = "code"), + @Mapping(source = "detailDO.interfaceType", target = "interfaceType"), + @Mapping(source = "mainDO.remark", target = "remark"), + @Mapping(source = "mainDO.createTime", target = "createTime"), + @Mapping(source = "mainDO.creator", target = "creator"), + }) + InspectRecordMainExcelVO convert(InspectRecordMainDO mainDO, InspectRecordDetailDO detailDO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestDetailConvert.java index d23a2bdd..04b75baf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestDetailConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestDetailConvert.java @@ -1,16 +1,15 @@ package com.win.module.wms.convert.inspectRequest; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.inspectRequest.vo.*; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; + +import java.util.List; /** * 检验申请子 Convert @@ -40,6 +39,7 @@ public interface InspectRequestDetailConvert { List convertList05(List subList); @Mappings({ + @Mapping(source = "mainDO.number", target = "number"), @Mapping(source = "mainDO.createTime", target = "createTime"), @Mapping(source = "mainDO.creator", target = "creator"), @Mapping(source = "mainDO.updateTime", target = "updateTime"), diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestMainConvert.java index ca027c93..309d1d5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestMainConvert.java @@ -1,13 +1,15 @@ package com.win.module.wms.convert.inspectRequest; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.inspectRequest.vo.*; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; + +import java.util.List; /** * 检验申请主 Convert @@ -32,4 +34,16 @@ public interface InspectRequestMainConvert { List convertList02(List list); InspectRequestMainDO convert(InspectRequestMainBaseVO baseVO); + + @Mappings({ + @Mapping(source = "mainDO.number", target = "number"), + @Mapping(source = "mainDO.uom", target = "uom"), + @Mapping(source = "detailDO.itemCode", target = "itemCode"), + @Mapping(source = "mainDO.createTime", target = "createTime"), + @Mapping(source = "mainDO.creator", target = "creator"), + @Mapping(source = "mainDO.updateTime", target = "updateTime"), + @Mapping(source = "mainDO.updater", target = "updater"), + }) + InspectRequestMainExcelVO convert(InspectRequestMainDO mainDO, InspectRequestDetailDO detailDO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java index 49e2727a..d492b501 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.countRequest; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -102,18 +103,9 @@ public class CountRequestDetailDO extends BaseDO { /** * 从包装号 */ - private String fromPackingNumber; - /** - * 到包装号 - */ - private String toPackingNumber; + private String packingNumber; /** * 从器具号 */ - private String fromContainerNumber; - /** - * 到器具号 - */ - private String toContainerNumber; - + private String containerNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectin/ExpectinDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectin/ExpectinDO.java index 744d1b98..530b4c8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectin/ExpectinDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectin/ExpectinDO.java @@ -1,10 +1,13 @@ package com.win.module.wms.dal.dataobject.expectin; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; + import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 预计入库存 DO @@ -23,8 +26,8 @@ public class ExpectinDO extends BaseDO { /** * id */ - @TableId(type = IdType.INPUT) - private String id; + @TableId(type = IdType.AUTO) + private Long id; /** * 任务号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java index 483781b6..e1357108 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java @@ -1,10 +1,13 @@ package com.win.module.wms.dal.dataobject.expectout; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; + import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 预计出库存 DO @@ -23,8 +26,8 @@ public class ExpectoutDO extends BaseDO { /** * id */ - @TableId(type = IdType.INPUT) - private String id; + @TableId(type = IdType.AUTO) + private Long id; /** * 任务号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java index fe829bf3..d2c66c03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java @@ -26,6 +26,10 @@ public class InspectRequestDetailDO extends BaseDO { */ @TableId private Long id; + /** + * 单据号 + */ + private String number; /** * 包装号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java index e03eb432..82bb3a8b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java @@ -63,6 +63,10 @@ public class PurchaseDetailDO extends BaseDO { * 转换率 */ private BigDecimal convertRate; + /** + * 已计划数量 + */ + private BigDecimal plannedQty; /** * 已发货数量 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java index b7cb5b6d..6507e6ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java @@ -86,11 +86,11 @@ public class PurchaseshortageDetailDO extends BaseDO { /** * 从库区代码 */ - private String fromAreaCodes; + private String fromAreaCode; /** * 到库区代码 */ - private String toAreaCodes; + private String toAreaCode; /** * 订单号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java index 91f60c5b..c285b8db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.supplierdeliverRequest; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -33,14 +34,6 @@ public class SupplierdeliverRequestDetailDO extends BaseDO { */ @TableId private Long id; - /** - * 包装号 - */ - private String packingNumber; - /** - * 器具号 - */ - private String containerNumber; /** * 批次 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestDetailDO.java index 22747794..e293f140 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.supplierinvoiceRequest; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.math.BigDecimal; @@ -38,22 +39,6 @@ public class SupplierinvoiceRequestDetailDO extends BaseDO { * 货主代码 */ private String ownerCode; - /** - * 包装号 - */ - private String packingNumber; - /** - * 器具号 - */ - private String containerNumber; - /** - * 批次 - */ - private String batch; - /** - * 替代批次 - */ - private String altBatch; /** * 订单号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java index 4c042438..3e6915aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java @@ -60,5 +60,8 @@ public interface AccountcalendarMapper extends BaseMapperX { .eqIfPresent(AccountcalendarDO::getCreator, reqVO.getCreator()) .orderByDesc(AccountcalendarDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java index c42e939e..09354b7c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java @@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.areabasic.vo.AreabasicExportReqVO; import com.win.module.wms.controller.areabasic.vo.AreabasicPageReqVO; import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -58,5 +59,8 @@ public interface AreabasicMapper extends BaseMapperX { .eqIfPresent(AreabasicDO::getCreator, reqVO.getCreator()) .orderByDesc(AreabasicDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java index c1ba720a..b6819590 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java @@ -62,5 +62,7 @@ public interface BomMapper extends BaseMapperX { .eqIfPresent(BomDO::getCreator, reqVO.getCreator()) .orderByDesc(BomDO::getId)); } - + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java index 046b7361..916cfae4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java @@ -40,10 +40,8 @@ public interface CountRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { @@ -69,10 +67,8 @@ public interface CountRequestDetailMapper extends BaseMapperX .eqIfPresent(CurrencyexchangeDO::getCreator, reqVO.getCreator()) .orderByDesc(CurrencyexchangeDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java index 982bb331..58e35eb3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java @@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customer.vo.CustomerExportReqVO; import com.win.module.wms.controller.customer.vo.CustomerPageReqVO; import com.win.module.wms.dal.dataobject.customer.CustomerDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -74,4 +75,7 @@ public interface CustomerMapper extends BaseMapperX { default CustomerDO selectByCode(String code){return selectOne(CustomerDO::getCode, code); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java index 7fc7d24e..d2515973 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerdock/CustomerdockMapper.java @@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerdock.vo.CustomerdockExportReqVO; import com.win.module.wms.controller.customerdock.vo.CustomerdockPageReqVO; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -66,4 +67,7 @@ public interface CustomerdockMapper extends BaseMapperX { default CustomerdockDO selectByCode(String code){return selectOne(CustomerdockDO::getCode, code); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java index b9a25785..98f55b99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java @@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customeritem.vo.CustomeritemExportReqVO; import com.win.module.wms.controller.customeritem.vo.CustomeritemPageReqVO; import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -65,4 +66,8 @@ public interface CustomeritemMapper extends BaseMapperX { } default CustomeritemDO selectByItemCode(String itemCode){return selectOne(CustomeritemDO::getItemCode, itemCode);}; + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java index 1142b905..c980a694 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java @@ -44,6 +44,7 @@ public interface CustomerreturnRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { @@ -73,6 +74,7 @@ public interface CustomerreturnRequestDetailMapper extends BaseMapperX { } default DockDO selectByItemCode(String code){return selectOne(DockDO ::getCode,code);}; + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java index a3a25eeb..9b4e9edf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java @@ -1,17 +1,17 @@ package com.win.module.wms.dal.mysql.expectin; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 预计入库存 Mapper * @@ -52,4 +52,8 @@ public interface ExpectinMapper extends BaseMapperX { .orderByDesc(ExpectinDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java index fbc257c1..d3b02f67 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java @@ -1,17 +1,17 @@ package com.win.module.wms.dal.mysql.expectout; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 预计出库存 Mapper * @@ -54,4 +54,8 @@ public interface ExpectoutMapper extends BaseMapperX { .orderByDesc(ExpectoutDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java index 64a100fb..fb9499ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java @@ -1,17 +1,17 @@ package com.win.module.wms.dal.mysql.inspectJob; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 检验任务子 Mapper * @@ -22,6 +22,7 @@ public interface InspectJobDetailMapper extends BaseMapperX default PageResult selectPage(InspectJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(InspectJobDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InspectJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(InspectJobDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(InspectJobDetailDO::getInventoryStatus, reqVO.getInventoryStatus()) @@ -63,4 +64,9 @@ public interface InspectJobDetailMapper extends BaseMapperX .orderByDesc(InspectJobDetailDO::getId)); } + default List selectList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(InspectJobDetailDO::getMasterId, masterId)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java index 2bf90c8b..151171ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java @@ -1,19 +1,20 @@ package com.win.module.wms.dal.mysql.inspectJob; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO; import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; -import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; +import com.win.module.wms.enums.order.OrderStatusEnum; import org.apache.ibatis.annotations.Mapper; +import java.util.Collection; +import java.util.List; + /** * 检验任务主 Mapper * @@ -78,6 +79,12 @@ public interface InspectJobMainMapper extends BaseMapperX { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); } + default Long selectByRequestNumber(String requestNumber) { + return selectCount(new LambdaQueryWrapperX() + .eq(InspectJobMainDO::getRequestNumber, requestNumber) + .ne(InspectJobMainDO::getStatus, OrderStatusEnum.CLOSED.getCode())); + } + default List selectList(InspectJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectJobMainDO::getRequestNumber, reqVO.getRequestNumber()) @@ -184,5 +191,8 @@ public interface InspectJobMainMapper extends BaseMapperX { } + default List selectList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java index ee22d652..15939f5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java @@ -1,17 +1,17 @@ package com.win.module.wms.dal.mysql.inspectRecord; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 检验记录子 Mapper * @@ -22,6 +22,7 @@ public interface InspectRecordDetailMapper extends BaseMapperX selectPage(InspectRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(InspectRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InspectRecordDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(InspectRecordDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(InspectRecordDetailDO::getFromLocationCode, reqVO.getFromLocationCode()) @@ -60,6 +61,7 @@ public interface InspectRecordDetailMapper extends BaseMapperX selectList(InspectRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(InspectRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InspectRecordDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(InspectRecordDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(InspectRecordDetailDO::getFromLocationCode, reqVO.getFromLocationCode()) @@ -94,4 +96,9 @@ public interface InspectRecordDetailMapper extends BaseMapperX selectList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(InspectRecordDetailDO::getMasterId, masterId)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java index e47c0f9e..af85be14 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java @@ -1,17 +1,17 @@ package com.win.module.wms.dal.mysql.inspectRecord; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 检验记录主 Mapper * @@ -108,4 +108,8 @@ public interface InspectRecordMainMapper extends BaseMapperX selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java index 5c0c97a3..363574a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java @@ -1,17 +1,17 @@ package com.win.module.wms.dal.mysql.inspectRequest; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 检验申请子 Mapper * @@ -35,6 +35,7 @@ public interface InspectRequestDetailMapper extends BaseMapperX selectList(InspectRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(InspectRequestDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InspectRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(InspectRequestDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(InspectRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus()) @@ -57,7 +59,13 @@ public interface InspectRequestDetailMapper extends BaseMapperX selectList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(InspectRequestDetailDO::getMasterId, masterId)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java index 557e9982..ed6545ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java @@ -1,18 +1,17 @@ package com.win.module.wms.dal.mysql.inspectRequest; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; -import com.win.module.wms.dal.dataobject.purchasereturnRequest.PurchasereturnRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 检验申请主 Mapper * @@ -98,4 +97,9 @@ public interface InspectRequestMainMapper extends BaseMapperX selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itembasic/ItembasicMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itembasic/ItembasicMapper.java index 6c852dab..3d42d21c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itembasic/ItembasicMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itembasic/ItembasicMapper.java @@ -94,4 +94,8 @@ public interface ItembasicMapper extends BaseMapperX { .orderByDesc(ItembasicDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java index 1c1512fb..916e6aba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.itempackaging.vo.ItempackagingExportReqVO; import com.win.module.wms.controller.itempackaging.vo.ItempackagingPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import org.apache.ibatis.annotations.Mapper; @@ -69,4 +70,7 @@ public interface ItempackagingMapper extends BaseMapperX { } default ItempackagingDO selectByItemCode(String itemCode){return selectOne(ItempackagingDO::getItemCode,itemCode);}; + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java index 0516283d..b4b2a17c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.location.vo.LocationExportReqVO; import com.win.module.wms.controller.location.vo.LocationPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import org.apache.ibatis.annotations.Mapper; @@ -79,4 +80,7 @@ public interface LocationMapper extends BaseMapperX { } default LocationDO selectByCode(String code){return selectOne(LocationDO::getCode,code);}; + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java index a0bf6491..286acbbc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.locationgroup.vo.LocationgroupExportReqVO; import com.win.module.wms.controller.locationgroup.vo.LocationgroupPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO; import org.apache.ibatis.annotations.Mapper; @@ -55,4 +56,8 @@ public interface LocationgroupMapper extends BaseMapperX { } default LocationgroupDO selectByCode(String code){return selectOne(LocationgroupDO::getCode,code);}; + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java index 4adacbc4..e0e3f86e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java @@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.process.vo.ProcessExportReqVO; import com.win.module.wms.controller.process.vo.ProcessPageReqVO; import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.process.ProcessDO; import org.apache.ibatis.annotations.Mapper; @@ -59,4 +60,7 @@ public interface ProcessMapper extends BaseMapperX { } default ProcessDO selectByCode(String code){return selectOne(ProcessDO::getCode,code);}; + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java index 9158eb92..60e8fcfe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionline.vo.ProductionlineExportReqVO; import com.win.module.wms.controller.productionline.vo.ProductionlinePageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; import org.apache.ibatis.annotations.Mapper; @@ -60,4 +61,8 @@ public interface ProductionlineMapper extends BaseMapperX { } default ProductionlineDO selectByCode(String code){return selectOne(ProductionlineDO::getCode,code);}; + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java index a474a028..f3df726c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionlineitem.vo.ProductionlineitemExportReqVO; import com.win.module.wms.controller.productionlineitem.vo.ProductionlineitemPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import org.apache.ibatis.annotations.Mapper; @@ -24,6 +25,7 @@ public interface ProductionlineitemMapper extends BaseMapperX() .eqIfPresent(ProductionlineitemDO::getFgLocationCode, reqVO.getFgLocationCode()) .eqIfPresent(ProductionlineitemDO::getProductionLineCode, reqVO.getProductionLineCode()) + .eqIfPresent(ProductionlineitemDO::getRawLocationCode, reqVO.getRawLocationCode()) .eqIfPresent(ProductionlineitemDO::getItemCode, reqVO.getItemCode()) .eqIfPresent(ProductionlineitemDO::getRawLocationCode, reqVO.getRawLocationCode()) .eqIfPresent(ProductionlineitemDO::getAvailable, reqVO.getAvailable()) @@ -41,6 +43,7 @@ public interface ProductionlineitemMapper extends BaseMapperX() .eqIfPresent(ProductionlineitemDO::getFgLocationCode, reqVO.getFgLocationCode()) .eqIfPresent(ProductionlineitemDO::getProductionLineCode, reqVO.getProductionLineCode()) + .eqIfPresent(ProductionlineitemDO::getRawLocationCode, reqVO.getRawLocationCode()) .eqIfPresent(ProductionlineitemDO::getItemCode, reqVO.getItemCode()) .eqIfPresent(ProductionlineitemDO::getRawLocationCode, reqVO.getRawLocationCode()) .eqIfPresent(ProductionlineitemDO::getAvailable, reqVO.getAvailable()) @@ -51,5 +54,7 @@ public interface ProductionlineitemMapper extends BaseMapperX selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java index b8fd9a94..854db2d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.project.vo.ProjectExportReqVO; import com.win.module.wms.controller.project.vo.ProjectPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.project.ProjectDO; import org.apache.ibatis.annotations.Mapper; @@ -52,4 +53,7 @@ public interface ProjectMapper extends BaseMapperX { } default ProjectDO selectByCode(String code){return selectOne(ProjectDO::getCode,code);}; + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java index 2f2e941a..d772ab2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java @@ -30,6 +30,7 @@ public interface PurchaseDetailMapper extends BaseMapperX { .eqIfPresent(PurchaseDetailDO::getSupplierQty, reqVO.getSupplierQty()) .eqIfPresent(PurchaseDetailDO::getSupplierUom, reqVO.getSupplierUom()) .eqIfPresent(PurchaseDetailDO::getConvertRate, reqVO.getConvertRate()) + .eqIfPresent(PurchaseDetailDO::getPlannedQty, reqVO.getPlannedQty()) .eqIfPresent(PurchaseDetailDO::getShippedQty, reqVO.getShippedQty()) .eqIfPresent(PurchaseDetailDO::getReceivedQty, reqVO.getReceivedQty()) .eqIfPresent(PurchaseDetailDO::getReturnedQty, reqVO.getReturnedQty()) @@ -64,6 +65,7 @@ public interface PurchaseDetailMapper extends BaseMapperX { .eqIfPresent(PurchaseDetailDO::getSupplierQty, reqVO.getSupplierQty()) .eqIfPresent(PurchaseDetailDO::getSupplierUom, reqVO.getSupplierUom()) .eqIfPresent(PurchaseDetailDO::getConvertRate, reqVO.getConvertRate()) + .eqIfPresent(PurchaseDetailDO::getPlannedQty, reqVO.getPlannedQty()) .eqIfPresent(PurchaseDetailDO::getShippedQty, reqVO.getShippedQty()) .eqIfPresent(PurchaseDetailDO::getReceivedQty, reqVO.getReceivedQty()) .eqIfPresent(PurchaseDetailDO::getReturnedQty, reqVO.getReturnedQty()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java index d93fdfe2..f3de7a4a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.purchaseprice.vo.PurchasepriceExportReqVO; import com.win.module.wms.controller.purchaseprice.vo.PurchasepricePageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.purchaseprice.PurchasepriceDO; import org.apache.ibatis.annotations.Mapper; @@ -53,4 +54,7 @@ public interface PurchasepriceMapper extends BaseMapperX { } default PurchasepriceDO selectByItemCode(String itemCode){return selectOne(PurchasepriceDO::getItemCode,itemCode);}; + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchaseshortageDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchaseshortageDetailMapper.java index 34f9f08a..20fd31ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchaseshortageDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchaseshortageDetailMapper.java @@ -34,8 +34,8 @@ public interface PurchaseshortageDetailMapper extends BaseMapperX { .eqIfPresent(SalepriceDO::getCreator, reqVO.getCreator()) .orderByDesc(SalepriceDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java index 1adc9721..6c3df105 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java @@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceExportReqVO; import com.win.module.wms.controller.stdcostprice.vo.StdcostpricePageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; import org.apache.ibatis.annotations.Mapper; @@ -56,5 +57,8 @@ public interface StdcostpriceMapper extends BaseMapperX { .eqIfPresent(StdcostpriceDO::getCreator, reqVO.getCreator()) .orderByDesc(StdcostpriceDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java index 2b84aec5..790d22ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java @@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.supplier.vo.SupplierExportReqVO; import com.win.module.wms.controller.supplier.vo.SupplierPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; import org.apache.ibatis.annotations.Mapper; @@ -74,5 +75,8 @@ public interface SupplierMapper extends BaseMapperX { .eqIfPresent(SupplierDO::getCreator, reqVO.getCreator()) .orderByDesc(SupplierDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java index 7fdaf2b3..32e5cba9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java @@ -66,6 +66,7 @@ public interface SupplierdeliverRecordDetailMapper extends BaseMapperX selectList(SupplierdeliverRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(SupplierdeliverRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(SupplierdeliverRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) .eqIfPresent(SupplierdeliverRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) .eqIfPresent(SupplierdeliverRecordDetailDO::getFromBatch, reqVO.getFromBatch()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java index 189826b4..330aa1bd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java @@ -22,8 +22,6 @@ public interface SupplierdeliverRequestDetailMapper extends BaseMapperX selectPage(SupplierdeliverRequestDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(SupplierdeliverRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) - .eqIfPresent(SupplierdeliverRequestDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(SupplierdeliverRequestDetailDO::getBatch, reqVO.getBatch()) .eqIfPresent(SupplierdeliverRequestDetailDO::getAltBatch, reqVO.getAltBatch()) .betweenIfPresent(SupplierdeliverRequestDetailDO::getArriveDate, reqVO.getArriveDate()) @@ -58,8 +56,6 @@ public interface SupplierdeliverRequestDetailMapper extends BaseMapperX selectList(SupplierdeliverRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(SupplierdeliverRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) - .eqIfPresent(SupplierdeliverRequestDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(SupplierdeliverRequestDetailDO::getBatch, reqVO.getBatch()) .eqIfPresent(SupplierdeliverRequestDetailDO::getAltBatch, reqVO.getAltBatch()) .betweenIfPresent(SupplierdeliverRequestDetailDO::getArriveDate, reqVO.getArriveDate()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java index 73755a35..83279f2a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java @@ -24,10 +24,6 @@ public interface SupplierinvoiceRequestDetailMapper extends BaseMapperX() .eqIfPresent(SupplierinvoiceRequestDetailDO::getRecordNumber, reqVO.getRecordNumber()) .eqIfPresent(SupplierinvoiceRequestDetailDO::getOwnerCode, reqVO.getOwnerCode()) - .eqIfPresent(SupplierinvoiceRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) - .eqIfPresent(SupplierinvoiceRequestDetailDO::getContainerNumber, reqVO.getContainerNumber()) - .eqIfPresent(SupplierinvoiceRequestDetailDO::getBatch, reqVO.getBatch()) - .eqIfPresent(SupplierinvoiceRequestDetailDO::getAltBatch, reqVO.getAltBatch()) .eqIfPresent(SupplierinvoiceRequestDetailDO::getPoNumber, reqVO.getPoNumber()) .eqIfPresent(SupplierinvoiceRequestDetailDO::getPoLine, reqVO.getPoLine()) .eqIfPresent(SupplierinvoiceRequestDetailDO::getStdPackQty, reqVO.getStdPackQty()) @@ -51,10 +47,6 @@ public interface SupplierinvoiceRequestDetailMapper extends BaseMapperX() .eqIfPresent(SupplierinvoiceRequestDetailDO::getRecordNumber, reqVO.getRecordNumber()) .eqIfPresent(SupplierinvoiceRequestDetailDO::getOwnerCode, reqVO.getOwnerCode()) - .eqIfPresent(SupplierinvoiceRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) - .eqIfPresent(SupplierinvoiceRequestDetailDO::getContainerNumber, reqVO.getContainerNumber()) - .eqIfPresent(SupplierinvoiceRequestDetailDO::getBatch, reqVO.getBatch()) - .eqIfPresent(SupplierinvoiceRequestDetailDO::getAltBatch, reqVO.getAltBatch()) .eqIfPresent(SupplierinvoiceRequestDetailDO::getPoNumber, reqVO.getPoNumber()) .eqIfPresent(SupplierinvoiceRequestDetailDO::getPoLine, reqVO.getPoLine()) .eqIfPresent(SupplierinvoiceRequestDetailDO::getStdPackQty, reqVO.getStdPackQty()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java index ec7168d3..48c79016 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.supplieritem.vo.SupplieritemExportReqVO; import com.win.module.wms.controller.supplieritem.vo.SupplieritemPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO; import org.apache.ibatis.annotations.Mapper; @@ -75,4 +76,7 @@ public interface SupplieritemMapper extends BaseMapperX { } default SupplieritemDO selectByItemcodeCode(String itemcode){return selectOne(SupplieritemDO::getItemCode,itemcode);} + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java index 4b450162..cbc42c17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarExportReqVO; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.systemcalendar.SystemcalendarDO; import org.apache.ibatis.annotations.Mapper; @@ -49,5 +50,8 @@ public interface SystemcalendarMapper extends BaseMapperX { .eqIfPresent(SystemcalendarDO::getCreator, reqVO.getCreator()) .orderByDesc(SystemcalendarDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java index a675b375..40554fc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java @@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.warehouse.vo.WarehouseExportReqVO; import com.win.module.wms.controller.warehouse.vo.WarehousePageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; @@ -58,5 +59,8 @@ public interface WarehouseMapper extends BaseMapperX { .eqIfPresent(WarehouseDO::getCreator, reqVO.getCreator()) .orderByDesc(WarehouseDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java index e83b06c3..e1596a3e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java @@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.workshop.vo.WorkshopExportReqVO; import com.win.module.wms.controller.workshop.vo.WorkshopPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import org.apache.ibatis.annotations.Mapper; @@ -57,5 +58,8 @@ public interface WorkshopMapper extends BaseMapperX { .eqIfPresent(WorkshopDO::getCreator, reqVO.getCreator()) .orderByDesc(WorkshopDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java index a463df12..0f31054c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java @@ -67,5 +67,8 @@ public interface WorkstationMapper extends BaseMapperX { .eqIfPresent(WorkstationDO::getCreator, reqVO.getCreator()) .orderByDesc(WorkstationDO::getId)); } + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java index ef6ef7de..dabc9f03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java @@ -49,10 +49,10 @@ public interface AccountcalendarService { /** * 获得账期日历列表 * - * @param ids 编号 + * @param conditions 编号 * @return 账期日历列表 */ - List getAccountcalendarList(Collection ids); + List getAccountcalendarList(CustomConditions conditions); /** * 获得账期日历分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java index 8c043fe5..b1de58c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java @@ -70,8 +70,8 @@ public class AccountcalendarServiceImpl implements AccountcalendarService { } @Override - public List getAccountcalendarList(Collection ids) { - return accountcalendarMapper.selectBatchIds(ids); + public List getAccountcalendarList(CustomConditions conditions) { + return accountcalendarMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicService.java index 3f14fc6c..6b236fc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicService.java @@ -49,10 +49,10 @@ public interface AreabasicService { /** * 获得库区列表 * - * @param ids 编号 + * @param conditions 编号 * @return 库区列表 */ - List getAreabasicList(Collection ids); + List getAreabasicList(CustomConditions conditions); /** * 获得库区分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicServiceImpl.java index 96cde880..6ad56827 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicServiceImpl.java @@ -68,8 +68,8 @@ public class AreabasicServiceImpl implements AreabasicService { } @Override - public List getAreabasicList(Collection ids) { - return areabasicMapper.selectBatchIds(ids); + public List getAreabasicList(CustomConditions conditions) { + return areabasicMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java index 92f02679..b636cfd7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java @@ -54,7 +54,7 @@ public interface BomService { * @param ids 编号 * @return 物料清单列表 */ - List getBomList(Collection ids); + List getBomList(CustomConditions conditions); /** * 获得物料清单分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java index 1e9c61cd..93651e8b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java @@ -75,10 +75,11 @@ public class BomServiceImpl implements BomService { } @Override - public List getBomList(Collection ids) { - return bomMapper.selectBatchIds(ids); + public List getBomList(CustomConditions conditions) { + return bomMapper.selectSeniorList(conditions); } + @Override public PageResult getBomPage(BomPageReqVO pageReqVO) { return bomMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java index d8e02dd2..ec51e093 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeService.java @@ -49,10 +49,10 @@ public interface CurrencyexchangeService { /** * 获得货币转换列表 * - * @param ids 编号 + * @param conditions 编号 * @return 货币转换列表 */ - List getCurrencyexchangeList(Collection ids); + List getCurrencyexchangeList(CustomConditions conditions); /** * 获得货币转换分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java index 2040ca6a..ab961db1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java @@ -80,8 +80,8 @@ public class CurrencyexchangeServiceImpl implements CurrencyexchangeService { } @Override - public List getCurrencyexchangeList(Collection ids) { - return currencyexchangeMapper.selectBatchIds(ids); + public List getCurrencyexchangeList(CustomConditions conditions) { + return currencyexchangeMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java index 26d53bf7..27d1f678 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java @@ -52,7 +52,7 @@ public interface CustomerService { * @param ids 编号 * @return 客户列表 */ - List getCustomerList(Collection ids); + List getCustomerList(CustomConditions conditions); /** * 获得客户分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java index c119c65a..b7970ac4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java @@ -71,8 +71,8 @@ public class CustomerServiceImpl implements CustomerService { } @Override - public List getCustomerList(Collection ids) { - return customerMapper.selectBatchIds(ids); + public List getCustomerList(CustomConditions conditions) { + return customerMapper.selectSeniorList(conditions); } @Override @@ -199,8 +199,9 @@ public class CustomerServiceImpl implements CustomerService { public CustomerDO selectCustomerExist(String pcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",pcode); + queryWrapper.eq("available","TRUE"); CustomerDO customerDO = customerMapper.selectOne(queryWrapper); - if(customerDO != null && "TRUE".equals(customerDO.getAvailable())){ + if(customerDO != null){ return customerDO; }else { throw exception(CUSTOMER_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java index 535a98f7..6f07b208 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java @@ -52,7 +52,7 @@ public interface CustomerdockService { * @param ids 编号 * @return 客户月台列表 */ - List getCustomerdockList(Collection ids); + List getCustomerdockList(CustomConditions conditions); /** * 获得客户月台分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java index 3bbfbd9b..882e44e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java @@ -78,8 +78,8 @@ public class CustomerdockServiceImpl implements CustomerdockService { } @Override - public List getCustomerdockList(Collection ids) { - return customerdockMapper.selectBatchIds(ids); + public List getCustomerdockList(CustomConditions conditions) { + return customerdockMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java index c492dd6f..465d7cab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java @@ -52,7 +52,7 @@ public interface CustomeritemService { * @param ids 编号 * @return 客户物品列表 */ - List getCustomeritemList(Collection ids); + List getCustomeritemList(CustomConditions conditions); /** * 获得客户物品分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java index 08c8ebbc..347a6846 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java @@ -77,8 +77,8 @@ public class CustomeritemServiceImpl implements CustomeritemService { } @Override - public List getCustomeritemList(Collection ids) { - return customeritemMapper.selectBatchIds(ids); + public List getCustomeritemList(CustomConditions conditions) { + return customeritemMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java index b8759838..1630dcaf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java @@ -81,46 +81,49 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { public DeliverRecordDetailDO selectDeliverRecordExist(String pnumber,String pitemCode,String psoNumber,String psoLine){ QueryWrapper queryWrapperMain = new QueryWrapper(); queryWrapperMain.eq("number",pnumber); + queryWrapperMain.eq("available","TRUE"); DeliverRecordMainDO deliverRecordMainDO = deliverRecordMainMapper.selectOne(queryWrapperMain); - if(deliverRecordMainDO != null && "TRUE".equals(deliverRecordMainDO)){ + if(deliverRecordMainDO != null){ QueryWrapper queryWrapperDetail = new QueryWrapper(); queryWrapperDetail.eq("itemcode",pitemCode); queryWrapperDetail.eq("so_number",psoNumber); queryWrapperDetail.eq("so_line",psoLine); + queryWrapperDetail.eq("available","TRUE"); DeliverRecordDetailDO deliverRecordDetailDO = deliverRecordDetailMapper.selectOne(queryWrapperDetail); - if(deliverRecordDetailDO != null && "TRUE".equals(deliverRecordDetailDO.getAvailable())){ + if(deliverRecordDetailDO != null){ return deliverRecordDetailDO; }else { - throw new UtilException( "采购收货记录明细:销售订单号" + psoNumber + "、销售订单行、" + psoLine + "、物品代码" + pitemCode + "无效"); + throw exception(PURCHASERECEIPT_RECORD_DETAIL_EXCEPTION, "销售订单号" + psoNumber + "、销售订单行、" + psoLine + "、物品代码" + pitemCode + "无效"); } }else { - throw new UtilException( "发货订单无效" + pnumber + "无效"); - + throw exception(DELIVER_ORDER_DETAIL_EXCEPTION, "发货订单" + pnumber + "无效"); } } @Override public DeliverRecordMainDO selectsMainRecordExist(String pnumber){ QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("number",pnumber); + queryWrapper.eq("available","TRUE"); DeliverRecordMainDO deliverRecordMainDO = deliverRecordMainMapper.selectOne(queryWrapper); - if(deliverRecordMainDO != null && "TRUE".equals(deliverRecordMainDO.getAvailable())){ + if(deliverRecordMainDO != null){ return deliverRecordMainDO; } else{ - throw new UtilException( "发货记录无效"+pnumber+"无效"); + throw exception(DELIVER_RECORD_DETAIL_EXCEPTION,"单据号" + pnumber + "无效"); } } @Override public List selectsDeliverRecordExist(String pnumber) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.in("number",pnumber); + queryWrapper.eq("available","TRUE"); List deliverRecordDetailDO = deliverRecordDetailMapper.selectList(queryWrapper); if(!deliverRecordDetailDO.isEmpty()) { for (DeliverRecordDetailDO detail : deliverRecordDetailDO) { - if (detail != null && "TRUE".equals(detail.getAvailable())) { + if (detail != null) { return deliverRecordDetailDO; } else { - throw new UtilException("发货记录明细：单据号" + pnumber + "无效"); + throw exception(DELIVER_RECORD_DETAIL_EXCEPTION,"单据号" + pnumber + "无效"); } } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java index 61b0e00d..64379d5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java @@ -49,10 +49,10 @@ public interface DockService { /** * 获得月台列表 * - * @param ids 编号 + * @param conditions 编号 * @return 月台列表 */ - List getDockList(Collection ids); + List getDockList(CustomConditions conditions); /** * 获得月台分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java index 79c3ee21..1d93e7b9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java @@ -70,8 +70,8 @@ public class DockServiceImpl implements DockService { } @Override - public List getDockList(Collection ids) { - return dockMapper.selectBatchIds(ids); + public List getDockList(CustomConditions conditions) { + return dockMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java index 3fe7abbc..62a47e97 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java @@ -1,15 +1,14 @@ package com.win.module.wms.service.expectin; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; -import com.win.module.wms.controller.expectin.vo.ExpectinUpdateReqVO; import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.List; /** * 预计入库存 Service 接口 @@ -20,25 +19,24 @@ public interface ExpectinService { /** * 创建预计入库存 - * - * @param createReqVO 创建信息 - * @return 编号 + * @param createReqVOList 预计入 + * @return */ - String createExpectin(@Valid ExpectinCreateReqVO createReqVO); + void createExpectin(@Valid List createReqVOList); /** - * 更新预计入库存 + * 删除预计入库存 * - * @param updateReqVO 更新信息 + * @param id 编号 */ - void updateExpectin(@Valid ExpectinUpdateReqVO updateReqVO); + Integer deleteExpectin(Long id); /** * 删除预计入库存 * - * @param id 编号 + * @param jobNumber 任务号 */ - void deleteExpectin(Long id); + Integer deleteExpectinByJobNumber(String jobNumber); /** * 获得预计入库存 @@ -48,14 +46,6 @@ public interface ExpectinService { */ ExpectinDO getExpectin(String id); - /** - * 获得预计入库存列表 - * - * @param ids 编号 - * @return 预计入库存列表 - */ - List getExpectinList(Collection ids); - /** * 获得预计入库存分页 * @@ -81,4 +71,10 @@ public interface ExpectinService { */ List getExpectinList(ExpectinExportReqVO exportReqVO); + /** + * 获得预计入库存列表, 用于 Excel 导出 + * @param conditions + * @return + */ + List getExpectinList(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java index de1e270b..d3d6b479 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java @@ -1,24 +1,24 @@ package com.win.module.wms.service.expectin; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; -import com.win.module.wms.controller.expectin.vo.ExpectinUpdateReqVO; +import com.win.module.wms.convert.expectin.ExpectinConvert; +import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; +import com.win.module.wms.dal.mysql.expectin.ExpectinMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.expectin.ExpectinConvert; -import com.win.module.wms.dal.mysql.expectin.ExpectinMapper; +import javax.annotation.Resource; +import javax.validation.Validator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.EXPECTIN_NOT_EXISTS; /** * 预计入库存 Service 实现类 @@ -31,31 +31,28 @@ public class ExpectinServiceImpl implements ExpectinService { @Resource private ExpectinMapper expectinMapper; + @Resource + private Validator validator; @Override - public String createExpectin(ExpectinCreateReqVO createReqVO) { - // 插入 - ExpectinDO expectin = ExpectinConvert.INSTANCE.convert(createReqVO); - expectinMapper.insert(expectin); - // 返回 - return expectin.getId(); + public void createExpectin(List createReqVOList) { + List expectinDOList = ExpectinConvert.INSTANCE.convertList03(createReqVOList); + expectinMapper.insertBatch(expectinDOList); } @Override - public void updateExpectin(ExpectinUpdateReqVO updateReqVO) { + public Integer deleteExpectin(Long id) { // 校验存在 - validateExpectinExists(updateReqVO.getId()); - // 更新 - ExpectinDO updateObj = ExpectinConvert.INSTANCE.convert(updateReqVO); - expectinMapper.updateById(updateObj); + validateExpectinExists(id); + // 删除 + return expectinMapper.deleteById(id); } @Override - public void deleteExpectin(Long id) { - // 校验存在 - validateExpectinExists(id); - // 删除 - expectinMapper.deleteById(id); + public Integer deleteExpectinByJobNumber(String jobNumber) { + Map map = new HashMap<>(); + map.put("job_number", jobNumber); + return expectinMapper.deleteByMap(map); } private void validateExpectinExists(Long id) { @@ -69,11 +66,6 @@ public class ExpectinServiceImpl implements ExpectinService { return expectinMapper.selectById(id); } - @Override - public List getExpectinList(Collection ids) { - return expectinMapper.selectBatchIds(ids); - } - @Override public PageResult getExpectinPage(ExpectinPageReqVO pageReqVO) { return expectinMapper.selectPage(pageReqVO); @@ -89,4 +81,9 @@ public class ExpectinServiceImpl implements ExpectinService { return expectinMapper.selectList(exportReqVO); } + @Override + public List getExpectinList(CustomConditions conditions) { + return expectinMapper.selectSeniorList(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java index 526740f2..0453b9ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java @@ -1,15 +1,14 @@ package com.win.module.wms.service.expectout; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; -import com.win.module.wms.controller.expectout.vo.ExpectoutUpdateReqVO; import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.List; /** * 预计出库存 Service 接口 @@ -21,24 +20,24 @@ public interface ExpectoutService { /** * 创建预计出库存 * - * @param createReqVO 创建信息 + * @param createReqVOList 预计出 * @return 编号 */ - String createExpectout(@Valid ExpectoutCreateReqVO createReqVO); + void createExpectout(@Valid List createReqVOList); /** - * 更新预计出库存 + * 删除预计出库存 * - * @param updateReqVO 更新信息 + * @param id 编号 */ - void updateExpectout(@Valid ExpectoutUpdateReqVO updateReqVO); + int deleteExpectout(Long id); /** * 删除预计出库存 * - * @param id 编号 + * @param jobNumber 任务号 */ - void deleteExpectout(Long id); + int deleteExpectoutByJobNumber(String jobNumber); /** * 获得预计出库存 @@ -48,14 +47,6 @@ public interface ExpectoutService { */ ExpectoutDO getExpectout(String id); - /** - * 获得预计出库存列表 - * - * @param ids 编号 - * @return 预计出库存列表 - */ - List getExpectoutList(Collection ids); - /** * 获得预计出库存分页 * @@ -124,4 +115,10 @@ public interface ExpectoutService { */ public List selectUniqeIdNew(String packingnumber, String locationcode, List inventorystatus); + /** + * 获得预计入库存列表, 用于 Excel 导出 + * @param conditions + * @return + */ + List getExpectoutList(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java index 6e69b849..ecf541df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java @@ -2,25 +2,25 @@ package com.win.module.wms.service.expectout; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; -import com.win.module.wms.controller.expectout.vo.ExpectoutUpdateReqVO; +import com.win.module.wms.convert.expectout.ExpectoutConvert; +import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; +import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; import com.win.module.wms.service.rule.RuleService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.expectout.ExpectoutConvert; -import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; +import javax.annotation.Resource; +import javax.validation.Validator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.EXPECTOUT_NOT_EXISTS; /** * 预计出库存 Service 实现类 @@ -36,31 +36,28 @@ public class ExpectoutServiceImpl implements ExpectoutService { @Resource private RuleService ruleService; + @Resource + private Validator validator; @Override - public String createExpectout(ExpectoutCreateReqVO createReqVO) { - // 插入 - ExpectoutDO expectout = ExpectoutConvert.INSTANCE.convert(createReqVO); - expectoutMapper.insert(expectout); - // 返回 - return expectout.getId(); + public void createExpectout(List createReqVOList) { + List expectoutDOList = ExpectoutConvert.INSTANCE.convertList03(createReqVOList); + expectoutMapper.insertBatch(expectoutDOList); } @Override - public void updateExpectout(ExpectoutUpdateReqVO updateReqVO) { + public int deleteExpectout(Long id) { // 校验存在 - validateExpectoutExists(updateReqVO.getId()); - // 更新 - ExpectoutDO updateObj = ExpectoutConvert.INSTANCE.convert(updateReqVO); - expectoutMapper.updateById(updateObj); + validateExpectoutExists(id); + // 删除 + return expectoutMapper.deleteById(id); } @Override - public void deleteExpectout(Long id) { - // 校验存在 - validateExpectoutExists(id); - // 删除 - expectoutMapper.deleteById(id); + public int deleteExpectoutByJobNumber(String jobNumber) { + Map map = new HashMap<>(); + map.put("job_number", jobNumber); + return expectoutMapper.deleteByMap(map); } private void validateExpectoutExists(Long id) { @@ -74,11 +71,6 @@ public class ExpectoutServiceImpl implements ExpectoutService { return expectoutMapper.selectById(id); } - @Override - public List getExpectoutList(Collection ids) { - return expectoutMapper.selectBatchIds(ids); - } - @Override public PageResult getExpectoutPage(ExpectoutPageReqVO pageReqVO) { return expectoutMapper.selectPage(pageReqVO); @@ -97,7 +89,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按数量查找 BY_BATCH @Override public List selectNumberNew(String itemcode, List inventorystatus, String locationcode) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("inventory_status", inventorystatus); queryWrapper.eq("location_code", locationcode); @@ -112,7 +104,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按批次查询 BY_BATCH @Override public List selectBatchNew(String itemcode, String batch, List inventorystatus, String locationcode) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("batch", batch); queryWrapper.eq("inventory_status", inventorystatus); @@ -128,7 +120,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按包裝 BY_PACKAGING @Override public List selectPackingNew(String itemcode, String packingnumber, String batch, List inventorystatus, String locationcode) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("batch", batch); queryWrapper.eq("packing_number", packingnumber); @@ -145,7 +137,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按唯一码查询 BY_UNIQUE_ID @Override public List selectUniqeIdNew(String packingnumber, String locationcode, List inventorystatus) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("packing_number", packingnumber); queryWrapper.eq("inventory_status", inventorystatus); queryWrapper.eq("location_code", locationcode); @@ -156,4 +148,10 @@ public class ExpectoutServiceImpl implements ExpectoutService { return null; } } + + @Override + public List getExpectoutList(CustomConditions conditions) { + return expectoutMapper.selectSeniorList(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java index e9a214f9..ddbbc180 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java @@ -1,15 +1,12 @@ package com.win.module.wms.service.inspectJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO; -import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import java.util.List; /** * 检验任务子 Service 接口 @@ -18,44 +15,6 @@ import com.win.framework.common.pojo.PageResult; */ public interface InspectJobDetailService { - /** - * 创建检验任务子 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createInspectJobDetail(@Valid InspectJobDetailCreateReqVO createReqVO); - - /** - * 更新检验任务子 - * - * @param updateReqVO 更新信息 - */ - void updateInspectJobDetail(@Valid InspectJobDetailUpdateReqVO updateReqVO); - - /** - * 删除检验任务子 - * - * @param id 编号 - */ - void deleteInspectJobDetail(Long id); - - /** - * 获得检验任务子 - * - * @param id 编号 - * @return 检验任务子 - */ - InspectJobDetailDO getInspectJobDetail(Long id); - - /** - * 获得检验任务子列表 - * - * @param ids 编号 - * @return 检验任务子列表 - */ - List getInspectJobDetailList(Collection ids); - /** * 获得检验任务子分页 * @@ -81,4 +40,11 @@ public interface InspectJobDetailService { */ List getInspectJobDetailList(InspectJobDetailExportReqVO exportReqVO); + /** + * 根据主表id查询检验任务 + * @param masterId + * @return + */ + List selectList(Long masterId); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java index 3f17e55f..21ce2d3b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java @@ -1,24 +1,16 @@ package com.win.module.wms.service.inspectJob; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO; -import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailUpdateReqVO; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert; import com.win.module.wms.dal.mysql.inspectJob.InspectJobDetailMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import javax.annotation.Resource; +import java.util.List; /** * 检验任务子 Service 实现类 @@ -32,48 +24,6 @@ public class InspectJobDetailServiceImpl implements InspectJobDetailService { @Resource private InspectJobDetailMapper inspectJobDetailMapper; - @Override - public Long createInspectJobDetail(InspectJobDetailCreateReqVO createReqVO) { - // 插入 - InspectJobDetailDO inspectJobDetail = InspectJobDetailConvert.INSTANCE.convert(createReqVO); - inspectJobDetailMapper.insert(inspectJobDetail); - // 返回 - return inspectJobDetail.getId(); - } - - @Override - public void updateInspectJobDetail(InspectJobDetailUpdateReqVO updateReqVO) { - // 校验存在 - validateInspectJobDetailExists(updateReqVO.getId()); - // 更新 - InspectJobDetailDO updateObj = InspectJobDetailConvert.INSTANCE.convert(updateReqVO); - inspectJobDetailMapper.updateById(updateObj); - } - - @Override - public void deleteInspectJobDetail(Long id) { - // 校验存在 - validateInspectJobDetailExists(id); - // 删除 - inspectJobDetailMapper.deleteById(id); - } - - private void validateInspectJobDetailExists(Long id) { - if (inspectJobDetailMapper.selectById(id) == null) { - throw exception(INSPECT_JOB_DETAIL_NOT_EXISTS); - } - } - - @Override - public InspectJobDetailDO getInspectJobDetail(Long id) { - return inspectJobDetailMapper.selectById(id); - } - - @Override - public List getInspectJobDetailList(Collection ids) { - return inspectJobDetailMapper.selectBatchIds(ids); - } - @Override public PageResult getInspectJobDetailPage(InspectJobDetailPageReqVO pageReqVO) { return inspectJobDetailMapper.selectPage(pageReqVO); @@ -89,4 +39,9 @@ public class InspectJobDetailServiceImpl implements InspectJobDetailService { return inspectJobDetailMapper.selectList(exportReqVO); } + @Override + public List selectList(Long masterId) { + return inspectJobDetailMapper.selectList(masterId); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index fdb3b904..071127b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java @@ -1,14 +1,18 @@ package com.win.module.wms.service.inspectJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.inspectJob.vo.*; -import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO; +import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; +import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO; +import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; import org.springframework.lang.Nullable; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 检验任务主 Service 接口 * @@ -16,28 +20,6 @@ import org.springframework.lang.Nullable; */ public interface InspectJobMainService { - /** - * 创建检验任务主 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createInspectJobMain(@Valid InspectJobMainCreateReqVO createReqVO); - - /** - * 更新检验任务主 - * - * @param updateReqVO 更新信息 - */ - void updateInspectJobMain(@Valid InspectJobMainUpdateReqVO updateReqVO); - - /** - * 删除检验任务主 - * - * @param id 编号 - */ - void deleteInspectJobMain(Long id); - /** * 获得检验任务主 * @@ -46,14 +28,6 @@ public interface InspectJobMainService { */ InspectJobMainDO getInspectJobMain(Long id); - /** - * 获得检验任务主列表 - * - * @param ids 编号 - * @return 检验任务主列表 - */ - List getInspectJobMainList(Collection ids); - /** * 获得检验任务主分页 * @@ -78,6 +52,16 @@ public interface InspectJobMainService { * @return 检验任务主列表 */ List getInspectJobMainList(InspectJobMainExportReqVO exportReqVO); + + + /** + * 获得检验任务主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 检验任务主列表 + */ + List getInspectJobMainList(CustomConditions conditions); + /** * 校验任务状态正确 *@author chenfang @@ -100,4 +84,26 @@ public interface InspectJobMainService { * @return */ Map getCountByStatus(@Nullable Collection types); + + /** + * 承接任务 + * @param id + * @return + */ + Integer acceptInspectJobMain(Long id); + + /** + * 取消承接任务 + * @param id + * @return + */ + Integer cancelAcceptInspectJobMain(Long id); + + /** + * 执行任务 + * @param inspectJobMainUpdateReqVO + * @return + */ + Integer excuteInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index bc3502a8..68f42fe6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -2,21 +2,31 @@ package com.win.module.wms.service.inspectJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.inspectJob.vo.*; -import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO; +import com.win.framework.common.pojo.PageResult; +import com.win.module.infra.api.trends.TrendsApi; +import com.win.module.infra.enums.TrendsTypeEnum; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO; +import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; +import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO; +import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; +import com.win.module.wms.dal.mysql.inspectJob.InspectJobMainMapper; +import com.win.module.wms.enums.job.JobStatusState; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.inspectJob.InspectJobMainConvert; -import com.win.module.wms.dal.mysql.inspectJob.InspectJobMainMapper; +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static com.win.module.wms.enums.ErrorCodeConstants.*; /** @@ -30,49 +40,16 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { @Resource private InspectJobMainMapper inspectJobMainMapper; - - @Override - public Long createInspectJobMain(InspectJobMainCreateReqVO createReqVO) { - // 插入 - InspectJobMainDO inspectJobMain = InspectJobMainConvert.INSTANCE.convert(createReqVO); - inspectJobMainMapper.insert(inspectJobMain); - // 返回 - return inspectJobMain.getId(); - } - - @Override - public void updateInspectJobMain(InspectJobMainUpdateReqVO updateReqVO) { - // 校验存在 - validateInspectJobMainExists(updateReqVO.getId()); - // 更新 - InspectJobMainDO updateObj = InspectJobMainConvert.INSTANCE.convert(updateReqVO); - inspectJobMainMapper.updateById(updateObj); - } - - @Override - public void deleteInspectJobMain(Long id) { - // 校验存在 - validateInspectJobMainExists(id); - // 删除 - inspectJobMainMapper.deleteById(id); - } - - private void validateInspectJobMainExists(Long id) { - if (inspectJobMainMapper.selectById(id) == null) { - throw exception(INSPECT_JOB_MAIN_NOT_EXISTS); - } - } + @Resource + private AdminUserApi userApi; + @Resource + private TrendsApi trendsApi; @Override public InspectJobMainDO getInspectJobMain(Long id) { return inspectJobMainMapper.selectById(id); } - @Override - public List getInspectJobMainList(Collection ids) { - return inspectJobMainMapper.selectBatchIds(ids); - } - @Override public PageResult getInspectJobMainPage(InspectJobMainPageReqVO pageReqVO) { return inspectJobMainMapper.selectPage(pageReqVO); @@ -82,13 +59,20 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { public PageResult getInspectJobMainSenior(CustomConditions conditions) { return inspectJobMainMapper.selectSenior(conditions); } + @Override public List getInspectJobMainList(InspectJobMainExportReqVO exportReqVO) { return inspectJobMainMapper.selectList(exportReqVO); } + + @Override + public List getInspectJobMainList(CustomConditions conditions) { + return inspectJobMainMapper.selectList(conditions); + } + @Override public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("number",pnumber); queryWrapper.eq("status",pstatus); InspectJobMainDO inspectJobMainDO = inspectJobMainMapper.selectOne(queryWrapper); @@ -112,4 +96,54 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { map.put("count", l.intValue()); return map; } + + + @Override + @Transactional + public Integer acceptInspectJobMain(Long id) { + InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id); + JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus()); + if(!jobStatusState.accept()) { + throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR); + } + Long userId = getLoginUserId(); + AdminUserRespDTO userRespDTO = userApi.getUser(userId); + inspectJobMainDO.setStatus(jobStatusState.getState().getCode()); + inspectJobMainDO.setAcceptUserId(String.valueOf(userId)); + inspectJobMainDO.setAcceptUserName(userRespDTO.getNickname()); + inspectJobMainDO.setAcceptTime(LocalDateTime.now()); + trendsApi.createTrends(id, "inspectJob", "承接了到货检验任务", TrendsTypeEnum.UPDATE); + return inspectJobMainMapper.updateById(inspectJobMainDO); + } + + @Override + @Transactional + public Integer cancelAcceptInspectJobMain(Long id) { + InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id); + JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus()); + if(!jobStatusState.cancelAccept()) { + throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR); + } + inspectJobMainDO.setStatus(jobStatusState.getState().getCode()); + inspectJobMainDO.setAcceptUserId(null); + inspectJobMainDO.setAcceptUserName(null); + inspectJobMainDO.setAcceptTime(null); + trendsApi.createTrends(id, "inspectJob", "取消了到货检验任务", TrendsTypeEnum.UPDATE); + return inspectJobMainMapper.updateById(inspectJobMainDO); + } + + @Override + @Transactional + public Integer excuteInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) { + return 0; + } + + private InspectJobMainDO validateInspectJobMainExists(Long id) { + InspectJobMainDO inspectJobMainDO = inspectJobMainMapper.selectById(id); + if (inspectJobMainDO == null) { + throw exception(INSPECT_JOB_MAIN_NOT_EXISTS); + } + return inspectJobMainDO; + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java index 30e3934a..bf013d99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java @@ -1,15 +1,11 @@ package com.win.module.wms.service.inspectRecord; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import java.util.List; /** * 检验记录子 Service 接口 @@ -18,44 +14,6 @@ import com.win.framework.common.pojo.PageResult; */ public interface InspectRecordDetailService { - /** - * 创建检验记录子 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createInspectRecordDetail(@Valid InspectRecordDetailCreateReqVO createReqVO); - - /** - * 更新检验记录子 - * - * @param updateReqVO 更新信息 - */ - void updateInspectRecordDetail(@Valid InspectRecordDetailUpdateReqVO updateReqVO); - - /** - * 删除检验记录子 - * - * @param id 编号 - */ - void deleteInspectRecordDetail(Long id); - - /** - * 获得检验记录子 - * - * @param id 编号 - * @return 检验记录子 - */ - InspectRecordDetailDO getInspectRecordDetail(Long id); - - /** - * 获得检验记录子列表 - * - * @param ids 编号 - * @return 检验记录子列表 - */ - List getInspectRecordDetailList(Collection ids); - /** * 获得检验记录子分页 * @@ -72,13 +30,11 @@ public interface InspectRecordDetailService { */ PageResult getInspectRecordDetailSenior(CustomConditions conditions); - /** - * 获得检验记录子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 检验记录子列表 + * 根据主表id查询检验记录 + * @param masterId + * @return */ - List getInspectRecordDetailList(InspectRecordDetailExportReqVO exportReqVO); + List selectList(Long masterId); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java index 4364efbe..eb8786f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java @@ -1,24 +1,15 @@ package com.win.module.wms.service.inspectRecord; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailUpdateReqVO; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert; import com.win.module.wms.dal.mysql.inspectRecord.InspectRecordDetailMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import javax.annotation.Resource; +import java.util.List; /** * 检验记录子 Service 实现类 @@ -32,48 +23,6 @@ public class InspectRecordDetailServiceImpl implements InspectRecordDetailServic @Resource private InspectRecordDetailMapper inspectRecordDetailMapper; - @Override - public Long createInspectRecordDetail(InspectRecordDetailCreateReqVO createReqVO) { - // 插入 - InspectRecordDetailDO inspectRecordDetail = InspectRecordDetailConvert.INSTANCE.convert(createReqVO); - inspectRecordDetailMapper.insert(inspectRecordDetail); - // 返回 - return inspectRecordDetail.getId(); - } - - @Override - public void updateInspectRecordDetail(InspectRecordDetailUpdateReqVO updateReqVO) { - // 校验存在 - validateInspectRecordDetailExists(updateReqVO.getId()); - // 更新 - InspectRecordDetailDO updateObj = InspectRecordDetailConvert.INSTANCE.convert(updateReqVO); - inspectRecordDetailMapper.updateById(updateObj); - } - - @Override - public void deleteInspectRecordDetail(Long id) { - // 校验存在 - validateInspectRecordDetailExists(id); - // 删除 - inspectRecordDetailMapper.deleteById(id); - } - - private void validateInspectRecordDetailExists(Long id) { - if (inspectRecordDetailMapper.selectById(id) == null) { - throw exception(INSPECT_RECORD_DETAIL_NOT_EXISTS); - } - } - - @Override - public InspectRecordDetailDO getInspectRecordDetail(Long id) { - return inspectRecordDetailMapper.selectById(id); - } - - @Override - public List getInspectRecordDetailList(Collection ids) { - return inspectRecordDetailMapper.selectBatchIds(ids); - } - @Override public PageResult getInspectRecordDetailPage(InspectRecordDetailPageReqVO pageReqVO) { return inspectRecordDetailMapper.selectPage(pageReqVO); @@ -83,10 +32,10 @@ public class InspectRecordDetailServiceImpl implements InspectRecordDetailServic public PageResult getInspectRecordDetailSenior(CustomConditions conditions) { return inspectRecordDetailMapper.selectSenior(conditions); } - + @Override - public List getInspectRecordDetailList(InspectRecordDetailExportReqVO exportReqVO) { - return inspectRecordDetailMapper.selectList(exportReqVO); + public List selectList(Long masterId) { + return inspectRecordDetailMapper.selectList(masterId); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java index bceb9cbe..891498d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java @@ -1,15 +1,13 @@ package com.win.module.wms.service.inspectRecord; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO; +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import java.util.List; /** * 检验记录主 Service 接口 @@ -18,44 +16,6 @@ import com.win.framework.common.pojo.PageResult; */ public interface InspectRecordMainService { - /** - * 创建检验记录主 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createInspectRecordMain(@Valid InspectRecordMainCreateReqVO createReqVO); - - /** - * 更新检验记录主 - * - * @param updateReqVO 更新信息 - */ - void updateInspectRecordMain(@Valid InspectRecordMainUpdateReqVO updateReqVO); - - /** - * 删除检验记录主 - * - * @param id 编号 - */ - void deleteInspectRecordMain(Long id); - - /** - * 获得检验记录主 - * - * @param id 编号 - * @return 检验记录主 - */ - InspectRecordMainDO getInspectRecordMain(Long id); - - /** - * 获得检验记录主列表 - * - * @param ids 编号 - * @return 检验记录主列表 - */ - List getInspectRecordMainList(Collection ids); - /** * 获得检验记录主分页 * @@ -80,4 +40,12 @@ public interface InspectRecordMainService { */ List getInspectRecordMainList(InspectRecordMainExportReqVO exportReqVO); + /** + * 获得检验记录主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 采购收货申请主列表 + */ + List getInspectRecordMainList(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java index 1c5cf25a..cbb149aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java @@ -5,6 +5,7 @@ import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReq import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -32,48 +33,6 @@ public class InspectRecordMainServiceImpl implements InspectRecordMainService { @Resource private InspectRecordMainMapper inspectRecordMainMapper; - @Override - public Long createInspectRecordMain(InspectRecordMainCreateReqVO createReqVO) { - // 插入 - InspectRecordMainDO inspectRecordMain = InspectRecordMainConvert.INSTANCE.convert(createReqVO); - inspectRecordMainMapper.insert(inspectRecordMain); - // 返回 - return inspectRecordMain.getId(); - } - - @Override - public void updateInspectRecordMain(InspectRecordMainUpdateReqVO updateReqVO) { - // 校验存在 - validateInspectRecordMainExists(updateReqVO.getId()); - // 更新 - InspectRecordMainDO updateObj = InspectRecordMainConvert.INSTANCE.convert(updateReqVO); - inspectRecordMainMapper.updateById(updateObj); - } - - @Override - public void deleteInspectRecordMain(Long id) { - // 校验存在 - validateInspectRecordMainExists(id); - // 删除 - inspectRecordMainMapper.deleteById(id); - } - - private void validateInspectRecordMainExists(Long id) { - if (inspectRecordMainMapper.selectById(id) == null) { - throw exception(INSPECT_RECORD_MAIN_NOT_EXISTS); - } - } - - @Override - public InspectRecordMainDO getInspectRecordMain(Long id) { - return inspectRecordMainMapper.selectById(id); - } - - @Override - public List getInspectRecordMainList(Collection ids) { - return inspectRecordMainMapper.selectBatchIds(ids); - } - @Override public PageResult getInspectRecordMainPage(InspectRecordMainPageReqVO pageReqVO) { return inspectRecordMainMapper.selectPage(pageReqVO); @@ -89,4 +48,9 @@ public class InspectRecordMainServiceImpl implements InspectRecordMainService { return inspectRecordMainMapper.selectList(exportReqVO); } + @Override + public List getInspectRecordMainList(CustomConditions conditions) { + return inspectRecordMainMapper.selectSeniorList(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java index 271f2f04..d4553b39 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java @@ -1,15 +1,14 @@ package com.win.module.wms.service.inspectRequest; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; -import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.List; /** * 检验申请子 Service 接口 @@ -31,14 +30,14 @@ public interface InspectRequestDetailService { * * @param updateReqVO 更新信息 */ - void updateInspectRequestDetail(@Valid InspectRequestDetailUpdateReqVO updateReqVO); + int updateInspectRequestDetail(@Valid InspectRequestDetailUpdateReqVO updateReqVO); /** * 删除检验申请子 * * @param id 编号 */ - void deleteInspectRequestDetail(Long id); + int deleteInspectRequestDetail(Long id); /** * 获得检验申请子 @@ -51,10 +50,10 @@ public interface InspectRequestDetailService { /** * 获得检验申请子列表 * - * @param ids 编号 + * @param masterId 父id * @return 检验申请子列表 */ - List getInspectRequestDetailList(Collection ids); + List selectList(Long masterId); /** * 获得检验申请子分页 @@ -72,13 +71,4 @@ public interface InspectRequestDetailService { */ PageResult getInspectRequestDetailSenior(CustomConditions conditions); - - /** - * 获得检验申请子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 检验申请子列表 - */ - List getInspectRequestDetailList(InspectRequestDetailExportReqVO exportReqVO); - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java index 1a7a7af3..6910634f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java @@ -1,24 +1,34 @@ package com.win.module.wms.service.inspectRequest; +import cn.hutool.core.exceptions.UtilException; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.module.infra.api.trends.TrendsApi; +import com.win.module.infra.enums.TrendsTypeEnum; +import com.win.module.system.api.dict.DictDataApi; +import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; -import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailUpdateReqVO; +import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestDetailMapper; +import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestMainMapper; +import com.win.module.wms.service.itembasic.ItembasicService; +import com.win.module.wms.service.location.LocationService; +import com.win.module.wms.util.JobUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; -import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestDetailMapper; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.INSPECT_REQUEST_DETAIL_NOT_EXISTS; /** * 检验申请子 Service 实现类 @@ -31,37 +41,57 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ @Resource private InspectRequestDetailMapper inspectRequestDetailMapper; + @Resource + private InspectRequestMainMapper inspectRequestMainMapper; + @Resource + private ItembasicService itembasicService; + @Resource + private DictDataApi dictDataApi; + @Resource + private JobUtils jobUtils; + @Resource + private LocationService locationService; + @Resource + private TrendsApi trendsApi; @Override public Long createInspectRequestDetail(InspectRequestDetailCreateReqVO createReqVO) { // 插入 InspectRequestDetailDO inspectRequestDetail = InspectRequestDetailConvert.INSTANCE.convert(createReqVO); + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRequest"); + InspectRequestMainDO mainDO = inspectRequestMainMapper.selectById(createReqVO.getMasterId()); + this.validatorDetail(inspectRequestDetail, mainDO, businesstypeDO); inspectRequestDetailMapper.insert(inspectRequestDetail); + trendsApi.createTrends(inspectRequestDetail.getId(), "inspectRequestDetail", "增加了到货检验子表", TrendsTypeEnum.CREATE); // 返回 return inspectRequestDetail.getId(); } @Override - public void updateInspectRequestDetail(InspectRequestDetailUpdateReqVO updateReqVO) { + public int updateInspectRequestDetail(InspectRequestDetailUpdateReqVO updateReqVO) { // 校验存在 validateInspectRequestDetailExists(updateReqVO.getId()); // 更新 InspectRequestDetailDO updateObj = InspectRequestDetailConvert.INSTANCE.convert(updateReqVO); - inspectRequestDetailMapper.updateById(updateObj); + trendsApi.createTrends(updateObj.getId(), "inspectRequestDetail", updateObj.toString(), TrendsTypeEnum.UPDATE); + return inspectRequestDetailMapper.updateById(updateObj); } @Override - public void deleteInspectRequestDetail(Long id) { + public int deleteInspectRequestDetail(Long id) { // 校验存在 - validateInspectRequestDetailExists(id); + InspectRequestDetailDO inspectRequestDetailDO = validateInspectRequestDetailExists(id); + trendsApi.createTrends(id, "purchasereceiptRequestDetail", inspectRequestDetailDO.toString(), TrendsTypeEnum.DELETE); // 删除 - inspectRequestDetailMapper.deleteById(id); + return inspectRequestDetailMapper.deleteById(id); } - private void validateInspectRequestDetailExists(Long id) { - if (inspectRequestDetailMapper.selectById(id) == null) { + private InspectRequestDetailDO validateInspectRequestDetailExists(Long id) { + InspectRequestDetailDO inspectRequestDetailDO = inspectRequestDetailMapper.selectById(id); + if (inspectRequestDetailDO == null) { throw exception(INSPECT_REQUEST_DETAIL_NOT_EXISTS); } + return inspectRequestDetailDO; } @Override @@ -70,8 +100,8 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ } @Override - public List getInspectRequestDetailList(Collection ids) { - return inspectRequestDetailMapper.selectBatchIds(ids); + public List selectList(Long masterId) { + return inspectRequestDetailMapper.selectList(masterId); } @Override @@ -83,10 +113,56 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ public PageResult getInspectRequestDetailSenior(CustomConditions conditions) { return inspectRequestDetailMapper.selectSenior(conditions); } - - @Override - public List getInspectRequestDetailList(InspectRequestDetailExportReqVO exportReqVO) { - return inspectRequestDetailMapper.selectList(exportReqVO); + + //校验子表公共方法(适用于新增/修改) + private void validatorDetail(InspectRequestDetailDO detailDo, InspectRequestMainDO mainDo, BusinesstypeDO businesstypeDO) { + ItembasicDO itembasicDO = validatorItembasic(detailDo.getItemCode()); + detailDo.setItemDesc1(itembasicDO.getDesc1()); + detailDo.setItemDesc2(itembasicDO.getDesc2()); + detailDo.setItemName(itembasicDO.getName()); + detailDo.setProjectCode(itembasicDO.getProject()); + this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom()); + validatorIfInType(itembasicDO.getType(), businesstypeDO); + validatorLocation(detailDo.getFromLocationCode()); + validatorIfOutInventoryStatuses(detailDo.getInventoryStatus(), businesstypeDO); + validatorIfInFromLocationType(detailDo.getFromLocationCode(), businesstypeDO); + validatorLocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getPackingNumber(), mainDo.getBatch(), detailDo.getFromLocationCode(), detailDo.getInventoryStatus()); + } + + private ItembasicDO validatorItembasic(String itemCode) { + return itembasicService.selectItembasic(itemCode); + } + + //判断导入单位是否正确 + private void ifUomSuccess(String itemUom, String uom) { + DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictLabel(uom); + if (dictDataRespDTO != null) { + if (!itemUom.equals(dictDataRespDTO.getLabel())) { + throw new UtilException("提示单位" + uom + "错误，应该是" + itemUom); + } + } + } + + private void validatorIfInType(String itemType, BusinesstypeDO businesstypeDO) { + jobUtils.ifInType(itemType, businesstypeDO); + } + + private void validatorLocation(String fromLocationCode) { + locationService.selectLocation(fromLocationCode); + } + + private void validatorIfOutInventoryStatuses(String inventoryStatus, BusinesstypeDO businesstypeDO) { + jobUtils.ifOutInventoryStatuses(inventoryStatus, businesstypeDO); + } + + private void validatorIfInFromLocationType(String fromLocationCode, BusinesstypeDO businesstypeDO) { + jobUtils.ifInFromLocationType(fromLocationCode, businesstypeDO); + } + + private void validatorLocationReturnManagementAccuracy(String itemCode, String packingNumber, String batch, String fromLocationCode, String inventoryStatu) { + ArrayList inventoryStatus = new ArrayList<>(); + inventoryStatus.add(inventoryStatu); + jobUtils.selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, fromLocationCode, inventoryStatus); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java index 58f322dc..a8af0abc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java @@ -31,14 +31,14 @@ public interface InspectRequestMainService { * * @param updateReqVO 更新信息 */ - void updateInspectRequestMain(@Valid InspectRequestMainUpdateReqVO updateReqVO); + Integer updateInspectRequestMain(@Valid InspectRequestMainUpdateReqVO updateReqVO); /** * 删除检验申请主 * * @param id 编号 */ - void deleteInspectRequestMain(Long id); + Integer deleteInspectRequestMain(Long id); /** * 获得检验申请主 @@ -80,6 +80,14 @@ public interface InspectRequestMainService { */ List getInspectRequestMainList(InspectRequestMainExportReqVO exportReqVO); + /** + * 获得采购收货申请主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 采购收货申请主列表 + */ + List getInspectRequestMainList(CustomConditions conditions); + /** * @author chenfang * @param datas 主子表数据 @@ -104,4 +112,43 @@ public interface InspectRequestMainService { * @return */ BigDecimal selectInspectType(BigDecimal sampleQty, HashMap ruleAll); + + /** + * 关闭到货检验申请主 + * + * @param id 到货检验申请主ID + * @return 更新数量 + */ + Integer closeInspectRequestMain(Long id); + + /** + * 提交到货检验申请主 + * + * @param id 到货检验申请主ID + * @return 更新数量 + */ + Integer submitInspectRequestMain(Long id); + + /** + * 审批通过到货检验申请主 + * + * @param id 到货检验申请主ID + * @return 更新数量 + */ + Integer agreeInspectRequestMain(Long id); + + /** + * 处理到货检验申请主 + * @param id + * @return + */ + Integer handleInspectRequestMain(Long id); + /** + * 审批拒绝到货检验申请主 + * + * @param id 到货检验申请主ID + * @return 更新数量 + */ + Integer abortInspectRequestMain(Long id); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index 304ba5ee..daca7761 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -6,36 +6,52 @@ import cn.hutool.core.exceptions.UtilException; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.common.util.validation.ValidationUtils; -import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.dict.DictDataApi; import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; +import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.*; import com.win.module.wms.controller.rule.vo.RuleRespVO; +import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert; +import com.win.module.wms.convert.inspectJob.InspectJobMainConvert; +import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert; +import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert; import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; +import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; +import com.win.module.wms.dal.mysql.inspectJob.InspectJobDetailMapper; +import com.win.module.wms.dal.mysql.inspectJob.InspectJobMainMapper; +import com.win.module.wms.dal.mysql.inspectRecord.InspectRecordDetailMapper; +import com.win.module.wms.dal.mysql.inspectRecord.InspectRecordMainMapper; import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestDetailMapper; import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestMainMapper; -import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.request.RequestStatusEnum; +import com.win.module.wms.enums.request.RequestStatusState; +import com.win.module.wms.service.expectout.ExpectoutService; import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService; import com.win.module.wms.service.requestsetting.RequestsettingService; import com.win.module.wms.service.rule.RuleService; import com.win.module.wms.util.JobUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -50,8 +66,7 @@ import java.util.HashMap; import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.INSPECT_REQUEST_IMPORT_LIST_IS_EMPTY; -import static com.win.module.wms.enums.ErrorCodeConstants.INSPECT_REQUEST_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.*; /** * 检验申请主 Service 实现类 @@ -67,6 +82,10 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService @Resource private InspectRequestDetailMapper inspectRequestDetailMapper; @Resource + private InspectJobMainMapper inspectJobMainMapper; + @Resource + private InspectJobDetailMapper inspectJobDetailMapper; + @Resource private PurchasereceiptRecordMainService purchasereceiptRecordMainService; @Resource private SerialNumberApi serialNumberApi; @@ -86,51 +105,63 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService private RequestsettingService requestsettingService; @Resource private TrendsApi trendsApi; + @Resource + private InspectRecordMainMapper inspectRecordMainMapper; + @Resource + private InspectRecordDetailMapper inspectRecordDetailMapper; + @Resource + private ExpectoutService expectoutService; @Override @Transactional public Long createInspectRequestMain(InspectRequestMainCreateReqVO createReqVO) { RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("InspectRequest"); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRequest"); - InspectRequestMainDO inspectRequestMainDO = this.validatorCreate(createReqVO, businesstypeDO, requestsettingDO); + InspectRequestMainDO mainDO = this.validatorMain(createReqVO, businesstypeDO, requestsettingDO); + //子表校验 + List subList = createReqVO.getSubList(); + List subDOList = InspectRequestDetailConvert.INSTANCE.convertList03(subList); + for (InspectRequestDetailDO detailDO : subDOList) { + this.validatorDetail(detailDO, mainDO, businesstypeDO); + } String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_REQUEST.getCode()); - inspectRequestMainDO.setNumber(number); + mainDO.setNumber(number); + RequestStatusState requestStatusState = new RequestStatusState(); + requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute()); + mainDO.setStatus(requestStatusState.getState().getCode()); + inspectRequestMainMapper.insert(mainDO); + for (InspectRequestDetailDO detailDO : subDOList) { + detailDO.setNumber(number); + detailDO.setMasterId(mainDO.getId()); + } + inspectRequestDetailMapper.insertBatch(subDOList); //调用自动执行方法 - if (RequestStatusEnum.HANDLING.getCode().equals(inspectRequestMainDO.getStatus())) { - + if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { + this.generateJob(mainDO, subDOList); } trendsApi.createTrends(requestsettingDO.getId(), "InspectRequest", "增加了到货校验申请", TrendsTypeEnum.CREATE); - return inspectRequestMainDO.getId(); + return mainDO.getId(); } @Override @Transactional - public void updateInspectRequestMain(InspectRequestMainUpdateReqVO updateReqVO) { + public Integer updateInspectRequestMain(InspectRequestMainUpdateReqVO updateReqVO) { RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("InspectRequest"); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRequest"); - // 校验存在 validateInspectRequestMainExists(updateReqVO.getId()); - // 更新主表 - InspectRequestMainDO inspectRequestMainDO = validatorUpdate(updateReqVO, businesstypeDO, requestsettingDO); - if (RequestStatusEnum.HANDLING.getCode().equals(inspectRequestMainDO.getStatus())) { - - } + InspectRequestMainDO mainDO = this.validatorMain(updateReqVO, businesstypeDO, requestsettingDO); trendsApi.createTrends(requestsettingDO.getId(), "InspectRequest", "增加了到货校验申请", TrendsTypeEnum.CREATE); + // 更新主表 + return inspectRequestMainMapper.updateById(mainDO); } @Override @Transactional - public void deleteInspectRequestMain(Long id) { + public Integer deleteInspectRequestMain(Long id) { // 校验存在 validateInspectRequestMainExists(id); // 删除 - inspectRequestMainMapper.deleteById(id); - } - - private void validateInspectRequestMainExists(Long id) { - if (inspectRequestMainMapper.selectById(id) == null) { - throw exception(INSPECT_REQUEST_MAIN_NOT_EXISTS); - } + return inspectRequestMainMapper.deleteById(id); } @Override @@ -158,6 +189,11 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService return inspectRequestMainMapper.selectList(exportReqVO); } + @Override + public List getInspectRequestMainList(CustomConditions conditions) { + return inspectRequestMainMapper.selectSeniorList(conditions); + } + @Override @Transactional public List importInspectRequestList(List datas, Integer mode, boolean updatePart) { @@ -168,10 +204,10 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService datas.forEach(createReqVO -> { //主表校验方法 InspectRequestMainDO mainDO = InspectRequestMainConvert.INSTANCE.convert(createReqVO); - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRequest"); - String messageMain = this.validatorInspectRequestMainImport(mainDO, businesstypeDO); + String messageMain = this.validatorInspectRequestMainImport(mainDO); List subList = createReqVO.getSubList(); List subDOList = InspectRequestDetailConvert.INSTANCE.convertList03(subList); + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRequest"); for (InspectRequestDetailDO detailDO : subDOList) { String messageDetail = this.validatorInspectRequestDetailImport(detailDO, mainDO, businesstypeDO); InspectRequestDetailCreateReqVO inspectRequestDetailCreateReqVO = InspectRequestDetailConvert.INSTANCE.convert1(detailDO); @@ -183,15 +219,30 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService errorList.add(importVO); } } - mainDO.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增")); + mainDO.setBusinessType(businesstypeDO.getCode()); + mainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); + mainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); + RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("InspectRequest"); + mainDO.setAutoAgree(requestsettingDO.getAutoAgree()); + mainDO.setAutoCommit(requestsettingDO.getAutoCommit()); + mainDO.setAutoExecute(requestsettingDO.getAutoExecute()); + mainDO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); + RequestStatusState requestStatusState = new RequestStatusState(); + requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute()); + mainDO.setStatus(requestStatusState.getState().getCode()); if (errorList.isEmpty()) { InspectRequestMainDO existInspectRequestMainDO = inspectRequestMainMapper.selectPurchaseReceiptNumber(createReqVO.getPurchaseReceiptRecordNumber()); if (existInspectRequestMainDO == null && mode != 3) { String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_REQUEST.getCode()); mainDO.setNumber(number); + //调用自动执行方法 + if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { + this.generateJob(mainDO, subDOList); + } inspectRequestMainMapper.insert(mainDO); for(InspectRequestDetailDO inspectRequestDetailDO : subDOList) { inspectRequestDetailDO.setMasterId(mainDO.getId()); + inspectRequestDetailDO.setNumber(number); } inspectRequestDetailMapper.insertBatch(subDOList); } else if (existInspectRequestMainDO != null && mode != 2) { @@ -207,6 +258,146 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService return errorList; } + @Override + @Transactional + public Integer closeInspectRequestMain(Long id) { + // 校验存在存在下级单据 + InspectRequestMainDO mainDO = validateInspectRequestMainExists(id); + Long count = inspectJobMainMapper.selectByRequestNumber(mainDO.getNumber()); + if(count > 0) { + throw new ServiceException(INSPECT_REQUEST_JOB_EXISTS); + } + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.close(); + if(!flag) { + throw new ServiceException(INSPECT_REQUEST_CANNOT_CLOSE); + } + mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 + trendsApi.createTrends(id, "inspectRequest", "关闭了到货校验申请", TrendsTypeEnum.UPDATE); + return inspectRequestMainMapper.updateById(mainDO); + } + + @Override + @Transactional + public Integer submitInspectRequestMain(Long id) { + InspectRequestMainDO mainDO = validateInspectRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.submit(mainDO.getAutoAgree(), mainDO.getAutoExecute()); + if(!flag) { + throw new ServiceException(INSPECT_REQUEST_CANNOT_SUBMIT); + } + mainDO.setStatus(requestStatusState.getState().getCode()); + //调用自动执行方法 + if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { + this.generateJob(mainDO, inspectRequestDetailMapper.selectList(mainDO.getId())); + } + trendsApi.createTrends(id, "inspectRequest", "提交了到货校验申请", TrendsTypeEnum.UPDATE); + return inspectRequestMainMapper.updateById(mainDO); + } + + @Override + @Transactional + public Integer agreeInspectRequestMain(Long id) { + // 校验存在 + InspectRequestMainDO mainDO = validateInspectRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.agree(mainDO.getAutoExecute()); + if(!flag) { + throw new ServiceException(INSPECT_REQUEST_CANNOT_AGREE); + } + mainDO.setStatus(requestStatusState.getState().getCode()); + //调用自动执行方法 + if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { + this.generateJob(mainDO, inspectRequestDetailMapper.selectList(mainDO.getId())); + } + trendsApi.createTrends(id, "inspectRequest", "审批同意了到货校验申请", TrendsTypeEnum.UPDATE); + return inspectRequestMainMapper.updateById(mainDO); + } + + @Override + @Transactional + public Integer handleInspectRequestMain(Long id) { + // 校验存在 + InspectRequestMainDO mainDO = validateInspectRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.handle(); + if(!flag) { + throw new ServiceException(INSPECT_REQUEST_CANNOT_HANDLE); + } + mainDO.setStatus(requestStatusState.getState().getCode()); + //调用执行方法 + this.generateJob(mainDO, inspectRequestDetailMapper.selectList(mainDO.getId())); + trendsApi.createTrends(id, "inspectRequest", "执行了到货校验申请", TrendsTypeEnum.UPDATE); + return inspectRequestMainMapper.updateById(mainDO); + } + + @Override + @Transactional + public Integer abortInspectRequestMain(Long id) { + // 校验存在 + InspectRequestMainDO mainDO = validateInspectRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.reject(); + if(!flag) { + throw new ServiceException(INSPECT_REQUEST_CANNOT_ABORT); + } + mainDO.setStatus(requestStatusState.getState().getCode()); + trendsApi.createTrends(id, "inspectRequest", "审批拒绝了到货校验申请", TrendsTypeEnum.UPDATE); + return inspectRequestMainMapper.updateById(mainDO); + } + + /** + * 生成收货检验任务，不要改动事务传播方式，否则会有事务问题 + * @param mainDO 收货检验主 + * @param detailDOList 收货检验子 + */ + private void generateJob(InspectRequestMainDO mainDO, List detailDOList) { + //跳过任务直接生成记录 + if("TRUE".equals(mainDO.getDirectCreateRecord())) { + InspectRecordMainCreateReqVO inspectRecordMainCreateReqVO = new InspectRecordMainCreateReqVO(); + BeanUtils.copyProperties(mainDO, inspectRecordMainCreateReqVO); + inspectRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); + String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_RECORD.getCode()); + inspectRecordMainCreateReqVO.setNumber(number); + //增加业务类型 + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRecord"); + inspectRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); + inspectRecordMainMapper.insert(InspectRecordMainConvert.INSTANCE.convert(inspectRecordMainCreateReqVO)); + for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) { + InspectRecordDetailCreateReqVO inspectRecordDetailCreateReqVO = new InspectRecordDetailCreateReqVO(); + BeanUtils.copyProperties(inspectRequestDetailDO, inspectRecordDetailCreateReqVO); + inspectRecordDetailCreateReqVO.setNumber(number); + inspectRecordDetailMapper.insert(InspectRecordDetailConvert.INSTANCE.convert(inspectRecordDetailCreateReqVO)); + } + return; + } + List expectoutCreateReqVOList = new ArrayList<>(); + InspectJobMainDO inspectJobMainDO = InspectJobMainConvert.INSTANCE.convert(mainDO); + inspectJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); + String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_JOB.getCode()); + inspectJobMainDO.setNumber(number); + //增加业务类型 + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob"); + inspectJobMainDO.setBusinessType(businesstypeDO.getCode()); + inspectJobMainMapper.insert(inspectJobMainDO); + List inspectJobDetailDOList = new ArrayList<>(); + for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) { + InspectJobDetailDO inspectJobDetailDO = InspectJobDetailConvert.INSTANCE.convert(inspectRequestDetailDO); + inspectJobDetailDO.setNumber(number); + inspectJobDetailDO.setMasterId(inspectJobMainDO.getId()); + inspectJobDetailDOList.add(inspectJobDetailDO); + //预计出 + ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO(); + BeanUtils.copyProperties(inspectJobDetailDO, expectoutCreateReqVO); + expectoutCreateReqVO.setJobNumber(number); + expectoutCreateReqVOList.add(expectoutCreateReqVO); + } + inspectJobDetailMapper.insertBatch(inspectJobDetailDOList); + //增加预计出 + expectoutService.createExpectout(expectoutCreateReqVOList); + trendsApi.createTrends(inspectJobMainDO.getId(), "purchasereceiptJob", "到货检验申请生成到货检验任务", TrendsTypeEnum.CREATE); + } + //判断导入单位是否正确 private void ifUomSuccess(String itemUom, String uom) { DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictLabel(uom); @@ -307,69 +498,20 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService mainDO.setSampleQty(selectInspectType(mainDO.getReceiveQty(), rule)); } - private ItembasicDO validatorItembasic(String itemCode) { - return itembasicService.selectItembasic(itemCode); - } - - private void validatorLocation(String fromLocationCode) { - locationService.selectLocation(fromLocationCode); - } - - private void validatorIfInType(String itemType, BusinesstypeDO businesstypeDO) { - jobUtils.ifInType(itemType, businesstypeDO); - } - - private void validatorIfOutInventoryStatuses(String inventoryStatus, BusinesstypeDO businesstypeDO) { - jobUtils.ifOutInventoryStatuses(inventoryStatus, businesstypeDO); - } - - private void validatorIfInFromLocationType(String fromLocationCode, BusinesstypeDO businesstypeDO) { - jobUtils.ifInFromLocationType(fromLocationCode, businesstypeDO); - } - - private void validatorLocationReturnManagementAccuracy(String itemCode, String packingNumber, String batch, String fromLocationCode, String inventoryStatu) { - ArrayList inventoryStatus = new ArrayList<>(); - inventoryStatus.add(inventoryStatu); - jobUtils.selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, fromLocationCode, inventoryStatus); - } - - // 新增校验 - private InspectRequestMainDO validatorCreate(InspectRequestMainCreateReqVO createReqVO, BusinesstypeDO businesstypeDO, RequestsettingDO requestsettingDO) { - InspectRequestMainDO mainDo = validatorMainMethod(createReqVO, businesstypeDO, requestsettingDO); - //子表校验 - List subList = createReqVO.getSubList(); - List subDOList = InspectRequestDetailConvert.INSTANCE.convertList03(subList); - for (InspectRequestDetailDO detailDO : subDOList) { - validatorDetailMethod(detailDO, mainDo, businesstypeDO); - } - String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_RECORD.getCode()); - mainDo.setNumber(number); - mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增")); - inspectRequestMainMapper.insert(mainDo); - inspectRequestDetailMapper.insertBatch(subDOList); - return mainDo; - } - - //修改校验 - private InspectRequestMainDO validatorUpdate(InspectRequestMainUpdateReqVO updateReqVO, BusinesstypeDO businesstypeDO, RequestsettingDO requestsettingDO) { - InspectRequestMainDO mainDo = validatorMainMethod(updateReqVO, businesstypeDO, requestsettingDO); - //子表校验 - List subList = updateReqVO.getSubList(); - List subDOList = InspectRequestDetailConvert.INSTANCE.convertList05(subList); - for (InspectRequestDetailDO detailDO : subDOList) { - validatorDetailMethod(detailDO, mainDo, businesstypeDO); + private InspectRequestMainDO validateInspectRequestMainExists(Long id) { + InspectRequestMainDO mainDO = inspectRequestMainMapper.selectById(id); + if (mainDO == null) { + throw exception(INSPECT_REQUEST_MAIN_NOT_EXISTS); } - inspectRequestMainMapper.updateById(mainDo); - inspectRequestDetailMapper.updateBatch(subDOList); - return mainDo; + return mainDO; } //校验主表公共方法(适用于新增/修改) - private InspectRequestMainDO validatorMainMethod(InspectRequestMainBaseVO baseVO, BusinesstypeDO businesstypeDO, RequestsettingDO requestsettingDO) { + private InspectRequestMainDO validatorMain(InspectRequestMainBaseVO baseVO, BusinesstypeDO businesstypeDO, RequestsettingDO requestsettingDO) { InspectRequestMainDO mainDo = InspectRequestMainConvert.INSTANCE.convert(baseVO); - PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = validatorPurchasereceiptExist(mainDo.getPurchaseReceiptRecordNumber(), mainDo.getPoNumber(), mainDo.getPoLine(), mainDo.getItemCode()); + PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = this.validatorPurchasereceiptExist(mainDo.getPurchaseReceiptRecordNumber(), mainDo.getPoNumber(), mainDo.getPoLine(), mainDo.getItemCode()); mainDo.setReceiveQty(purchasereceiptRecordDetailDO.getQty()); - validatorRule(mainDo); + this.validatorRule(mainDo); mainDo.setBusinessType(businesstypeDO.getCode()); mainDo.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); @@ -381,8 +523,9 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService } //校验子表公共方法(适用于新增/修改) - private void validatorDetailMethod(InspectRequestDetailDO detailDo, InspectRequestMainDO mainDo, BusinesstypeDO businesstypeDO) { + private void validatorDetail(InspectRequestDetailDO detailDo, InspectRequestMainDO mainDo, BusinesstypeDO businesstypeDO) { ItembasicDO itembasicDO = validatorItembasic(detailDo.getItemCode()); + detailDo.setNumber(mainDo.getNumber()); detailDo.setItemDesc1(itembasicDO.getDesc1()); detailDo.setItemDesc2(itembasicDO.getDesc2()); detailDo.setItemName(itembasicDO.getName()); @@ -401,7 +544,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService * @param mainDo * @return */ - private String validatorInspectRequestMainImport(InspectRequestMainDO mainDo, BusinesstypeDO businesstypeDO) { + private String validatorInspectRequestMainImport(InspectRequestMainDO mainDo) { StringBuilder message = new StringBuilder(); try { PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = validatorPurchasereceiptExist(mainDo.getPurchaseReceiptRecordNumber(), mainDo.getPoNumber(), mainDo.getPoLine(), mainDo.getItemCode()); @@ -414,22 +557,6 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService } catch (Exception ex) { message.append(ex.getMessage()).append(","); } - if (businesstypeDO == null) { - message.append("根据业务类型设置未查找到采购退货申请的相关业务类型"); - } else { - mainDo.setBusinessType(businesstypeDO.getCode()); - mainDo.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); - mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); - } - RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("InspectRequest"); - if (requestsettingDO == null) { - message.append("根据申请单设置未查找到采购退货申请的相关业务类型"); - } else { - mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); - mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); - mainDo.setAutoExecute(requestsettingDO.getAutoExecute()); - mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); - } try { ValidationUtils.validate(validator, mainDo); } catch (Exception ex) { @@ -493,4 +620,31 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService } return message.toString(); } + + private ItembasicDO validatorItembasic(String itemCode) { + return itembasicService.selectItembasic(itemCode); + } + + private void validatorLocation(String fromLocationCode) { + locationService.selectLocation(fromLocationCode); + } + + private void validatorIfInType(String itemType, BusinesstypeDO businesstypeDO) { + jobUtils.ifInType(itemType, businesstypeDO); + } + + private void validatorIfOutInventoryStatuses(String inventoryStatus, BusinesstypeDO businesstypeDO) { + jobUtils.ifOutInventoryStatuses(inventoryStatus, businesstypeDO); + } + + private void validatorIfInFromLocationType(String fromLocationCode, BusinesstypeDO businesstypeDO) { + jobUtils.ifInFromLocationType(fromLocationCode, businesstypeDO); + } + + private void validatorLocationReturnManagementAccuracy(String itemCode, String packingNumber, String batch, String fromLocationCode, String inventoryStatu) { + ArrayList inventoryStatus = new ArrayList<>(); + inventoryStatus.add(inventoryStatu); + jobUtils.selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, fromLocationCode, inventoryStatus); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java index 9bf63653..6f1c187d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java @@ -56,10 +56,10 @@ public interface ItembasicService { /** * 获得物品基本信息列表 * - * @param ids 编号 + * @param conditions 条件 * @return 物品基本信息列表 */ - List getItembasicList(Collection ids); + List getItembasicList(CustomConditions conditions); /** * 获得物品基本信息分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java index 2577ce37..60432365 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java @@ -89,8 +89,8 @@ public class ItembasicServiceImpl implements ItembasicService { } @Override - public List getItembasicList(Collection ids) { - return itembasicMapper.selectBatchIds(ids); + public List getItembasicList(CustomConditions conditions) { + return itembasicMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java index fbcfdd28..9b69898a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java @@ -52,7 +52,7 @@ public interface ItempackagingService { * @param ids 编号 * @return 物品包装信息 列表 */ - List getItempackagingList(Collection ids); + List getItempackagingList(CustomConditions conditions); /** * 获得物品包装信息 分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java index e1f586fc..0d1d6667 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java @@ -71,8 +71,8 @@ public class ItempackagingServiceImpl implements ItempackagingService { } @Override - public List getItempackagingList(Collection ids) { - return itempackagingMapper.selectBatchIds(ids); + public List getItempackagingList(CustomConditions conditions) { + return itempackagingMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java index 3e88c52a..e2945053 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java @@ -49,10 +49,10 @@ public interface LocationService { /** * 获得库位列表 * - * @param ids 编号 + * @param conditions 编号 * @return 库位列表 */ - List getLocationList(Collection ids); + List getLocationList(CustomConditions conditions); /** * 获得库位分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java index f53e1269..ecddc3c0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java @@ -86,8 +86,8 @@ public class LocationServiceImpl implements LocationService { } @Override - public List getLocationList(Collection ids) { - return locationMapper.selectBatchIds(ids); + public List getLocationList(CustomConditions conditions) { + return locationMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java index bb6bae5c..3c478044 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java @@ -49,10 +49,10 @@ public interface LocationgroupService { /** * 获得库位组列表 * - * @param ids 编号 + * @param conditions 编号 * @return 库位组列表 */ - List getLocationgroupList(Collection ids); + List getLocationgroupList(CustomConditions conditions); /** * 获得库位组分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java index ee11cc1c..a5e63294 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java @@ -71,8 +71,8 @@ public class LocationgroupServiceImpl implements LocationgroupService { } @Override - public List getLocationgroupList(Collection ids) { - return locationgroupMapper.selectBatchIds(ids); + public List getLocationgroupList(CustomConditions conditions) { + return locationgroupMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java index 769c5338..d994efb6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java @@ -50,10 +50,10 @@ public interface ProcessService { /** * 获得工序列表 * - * @param ids 编号 + * @param conditions 编号 * @return 工序列表 */ - List getProcessList(Collection ids); + List getProcessList(CustomConditions conditions); /** * 获得工序分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java index 8e57b309..6521600b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java @@ -70,8 +70,8 @@ public class ProcessServiceImpl implements ProcessService { } @Override - public List getProcessList(Collection ids) { - return processMapper.selectBatchIds(ids); + public List getProcessList(CustomConditions conditions) { + return processMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java index 097b9c2c..25c7570d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java @@ -49,10 +49,10 @@ public interface ProductionlineService { /** * 获得生产线列表 * - * @param ids 编号 + * @param conditions 编号 * @return 生产线列表 */ - List getProductionlineList(Collection ids); + List getProductionlineList(CustomConditions conditions); /** * 获得生产线分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java index 9912c10e..17d2ed75 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java @@ -73,8 +73,8 @@ public class ProductionlineServiceImpl implements ProductionlineService { } @Override - public List getProductionlineList(Collection ids) { - return productionlineMapper.selectBatchIds(ids); + public List getProductionlineList(CustomConditions conditions) { + return productionlineMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java index f52040b4..da24f266 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java @@ -52,7 +52,7 @@ public interface ProductionlineitemService { * @param ids 编号 * @return 生产线物料关系列表 */ - List getProductionlineitemList(Collection ids); + List getProductionlineitemList(CustomConditions conditions); /** * 获得生产线物料关系分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java index c72828d9..7c174301 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java @@ -72,8 +72,8 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService } @Override - public List getProductionlineitemList(Collection ids) { - return productionlineitemMapper.selectBatchIds(ids); + public List getProductionlineitemList(CustomConditions conditions) { + return productionlineitemMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java index 7ce3b085..e850dc10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java @@ -59,7 +59,7 @@ public interface ProjectService { * @param ids 编号 * @return 项目列表 */ - List getProjectList(Collection ids); + List getProjectList(CustomConditions conditions); /** * 获得项目分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java index ca95f896..a860f6b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java @@ -72,8 +72,8 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public List getProjectList(Collection ids) { - return projectMapper.selectBatchIds(ids); + public List getProjectList(CustomConditions conditions) { + return projectMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java index 3ef9bf25..7bd635bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java @@ -61,7 +61,7 @@ public interface PurchasepriceService { * @param ids 编号 * @return 采购价格单列表 */ - List getPurchasepriceList(Collection ids); + List getPurchasepriceList(CustomConditions conditions); /** * 获得采购价格单分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java index d73ee5f3..13bbcd02 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java @@ -75,8 +75,8 @@ public class PurchasepriceServiceImpl implements PurchasepriceService { } @Override - public List getPurchasepriceList(Collection ids) { - return purchasepriceMapper.selectBatchIds(ids); + public List getPurchasepriceList(CustomConditions conditions) { + return purchasepriceMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java index 264c3157..b16c1d4a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java @@ -22,14 +22,6 @@ public interface PurchasereceiptJobDetailService { */ PageResult getPurchasereceiptJobDetailSenior(CustomConditions conditions); - /** - * 获得采购收货任务子 - * - * @param id 编号 - * @return 采购收货任务子 - */ - PurchasereceiptJobDetailDO getPurchasereceiptJobDetail(Long id); - /** * 获得采购收货任务子分页 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java index bf94c0af..fc8813c6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java @@ -33,11 +33,6 @@ public class PurchasereceiptJobDetailServiceImpl implements PurchasereceiptJobDe return purchasereceiptJobDetailMapper.selectList(masterId); } - @Override - public PurchasereceiptJobDetailDO getPurchasereceiptJobDetail(Long id) { - return purchasereceiptJobDetailMapper.selectById(id); - } - @Override public PageResult getPurchasereceiptJobDetailPage(PurchasereceiptJobDetailPageReqVO pageReqVO) { return purchasereceiptJobDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index cff53e2c..d3fe9fa7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -92,19 +92,20 @@ public interface PurchasereceiptJobMainService { * @param id * @return */ - Integer accept(Long id); + Integer acceptPurchasereceiptJobMain(Long id); /** * 取消承接任务 * @param id * @return */ - Integer cancelAccept(Long id); + Integer cancelAcceptPurchasereceiptJobMain(Long id); /** - * 执行采购收货任务 + * 执行任务 * @param purchasereceiptJobMainUpdateReqVO * @return */ Integer excutePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index c6aa20fa..542f674f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -39,6 +39,7 @@ import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.documentSwitch.SwitchService; +import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.inspectRequest.InspectRequestMainService; import com.win.module.wms.service.rule.RuleService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; @@ -96,6 +97,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain private InspectRequestMainService inspectRequestMainService; @Resource private RuleService ruleService; + @Resource + private ExpectinService expectinService; @Override public PageResult getPurchasereceiptJobMainSenior(CustomConditions conditions) { @@ -164,7 +167,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain @Override @Transactional - public Integer accept(Long id) { + public Integer acceptPurchasereceiptJobMain(Long id) { PurchasereceiptJobMainDO purchasereceiptJobMainDO = this.validatePurchasereceiptJobMainExists(id); JobStatusState jobStatusState = new JobStatusState(purchasereceiptJobMainDO.getStatus()); if(!jobStatusState.accept()) { @@ -182,7 +185,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain @Override @Transactional - public Integer cancelAccept(Long id) { + public Integer cancelAcceptPurchasereceiptJobMain(Long id) { PurchasereceiptJobMainDO purchasereceiptJobMainDO = this.validatePurchasereceiptJobMainExists(id); JobStatusState jobStatusState = new JobStatusState(purchasereceiptJobMainDO.getStatus()); if(!jobStatusState.cancelAccept()) { @@ -306,7 +309,6 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain purchasereceiptRequestMainDO.setStatus(RequestStatusEnum.PARTIAL.getCode()); purchasereceiptRequestMainMapper.updateById(purchasereceiptRequestMainDO); } - //创建拣货申请 SwitchDO switchDO = switchService.selectSwitchExist("CreateInspectRequestAfterPurchaseReceiptRecordCreated"); //需要增加到货检验申请 if(switchDO.getEffectiveSetValue().equals("TRUE")) { @@ -369,6 +371,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain } //增加库存事务 transactionService.createTransaction(transactionCreateReqVOList); + //移除预计入 + expectinService.deleteExpectinByJobNumber(purchasereceiptJobMainDO.getNumber()); //变更记录 trendsApi.createTrends(purchasereceiptJobMainDO.getId(), "purchasereceiptJob", "执行了采购收货任务", TrendsTypeEnum.UPDATE); return null; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java index 54a11057..b63eefe5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java @@ -2,13 +2,9 @@ package com.win.module.wms.service.purchasereceiptRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; -import javax.validation.Valid; -import java.util.Collection; import java.util.List; /** @@ -18,27 +14,6 @@ import java.util.List; */ public interface PurchasereceiptRecordDetailService { - /** - * 创建采购收货记录子 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createPurchasereceiptRecordDetail(@Valid PurchasereceiptRecordDetailCreateReqVO createReqVO); - - /** - * 更新采购收货记录子 - * - * @param updateReqVO 更新信息 - */ - void updatePurchasereceiptRecordDetail(@Valid PurchasereceiptRecordDetailUpdateReqVO updateReqVO); - - /** - * 删除采购收货记录子 - * - * @param id 编号 - */ - void deletePurchasereceiptRecordDetail(Long id); /** * 获得用高级搜索采购收货记录子分页列表 * @@ -46,21 +21,6 @@ public interface PurchasereceiptRecordDetailService { * @return 分页列表 */ PageResult getPurchasereceiptRecordDetailSenior(CustomConditions conditions); - /** - * 获得采购收货记录子 - * - * @param id 编号 - * @return 采购收货记录子 - */ - PurchasereceiptRecordDetailDO getPurchasereceiptRecordDetail(Long id); - - /** - * 获得采购收货记录子列表 - * - * @param ids 编号 - * @return 采购收货记录子列表 - */ - List getPurchasereceiptRecordDetailList(Collection ids); /** * 获得采购收货记录子分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java index 6075784e..556c332b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java @@ -2,22 +2,15 @@ package com.win.module.wms.service.purchasereceiptRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailUpdateReqVO; -import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; -import java.util.Collection; import java.util.List; -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS; - /** * 采购收货记录子 Service 实现类 * @@ -30,50 +23,10 @@ public class PurchasereceiptRecordDetailServiceImpl implements PurchasereceiptRe @Resource private PurchasereceiptRecordDetailMapper purchasereceiptRecordDetailMapper; - @Override - public Long createPurchasereceiptRecordDetail(PurchasereceiptRecordDetailCreateReqVO createReqVO) { - // 插入 - PurchasereceiptRecordDetailDO purchasereceiptRecordDetail = PurchasereceiptRecordDetailConvert.INSTANCE.convert(createReqVO); - purchasereceiptRecordDetailMapper.insert(purchasereceiptRecordDetail); - // 返回 - return purchasereceiptRecordDetail.getId(); - } - - @Override - public void updatePurchasereceiptRecordDetail(PurchasereceiptRecordDetailUpdateReqVO updateReqVO) { - // 校验存在 - validatePurchasereceiptRecordDetailExists(updateReqVO.getId()); - // 更新 - PurchasereceiptRecordDetailDO updateObj = PurchasereceiptRecordDetailConvert.INSTANCE.convert(updateReqVO); - purchasereceiptRecordDetailMapper.updateById(updateObj); - } @Override public PageResult getPurchasereceiptRecordDetailSenior(CustomConditions conditions) { return purchasereceiptRecordDetailMapper.selectSenior(conditions); } - @Override - public void deletePurchasereceiptRecordDetail(Long id) { - // 校验存在 - validatePurchasereceiptRecordDetailExists(id); - // 删除 - purchasereceiptRecordDetailMapper.deleteById(id); - } - - private void validatePurchasereceiptRecordDetailExists(Long id) { - if (purchasereceiptRecordDetailMapper.selectById(id) == null) { - throw exception(PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS); - } - } - - @Override - public PurchasereceiptRecordDetailDO getPurchasereceiptRecordDetail(Long id) { - return purchasereceiptRecordDetailMapper.selectById(id); - } - - @Override - public List getPurchasereceiptRecordDetailList(Collection ids) { - return purchasereceiptRecordDetailMapper.selectBatchIds(ids); - } @Override public PageResult getPurchasereceiptRecordDetailPage(PurchasereceiptRecordDetailPageReqVO pageReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java index 52c63c8b..54e55105 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java @@ -2,15 +2,11 @@ package com.win.module.wms.service.purchasereceiptRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; -import javax.validation.Valid; -import java.util.Collection; import java.util.List; /** @@ -20,20 +16,6 @@ import java.util.List; */ public interface PurchasereceiptRecordMainService { - /** - * 创建采购收货记录主 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createPurchasereceiptRecordMain(@Valid PurchasereceiptRecordMainCreateReqVO createReqVO); - - /** - * 更新采购收货记录主 - * - * @param updateReqVO 更新信息 - */ - void updatePurchasereceiptRecordMain(@Valid PurchasereceiptRecordMainUpdateReqVO updateReqVO); /** * 获得用高级搜索采购收货记录主分页列表 * @@ -42,29 +24,6 @@ public interface PurchasereceiptRecordMainService { */ PageResult getPurchasereceiptRecordMainSenior(CustomConditions conditions); - /** - * 删除采购收货记录主 - * - * @param id 编号 - */ - void deletePurchasereceiptRecordMain(Long id); - - /** - * 获得采购收货记录主 - * - * @param id 编号 - * @return 采购收货记录主 - */ - PurchasereceiptRecordMainDO getPurchasereceiptRecordMain(Long id); - - /** - * 获得采购收货记录主列表 - * - * @param ids 编号 - * @return 采购收货记录主列表 - */ - List getPurchasereceiptRecordMainList(Collection ids); - /** * 获得采购收货记录主分页 * @@ -99,5 +58,5 @@ public interface PurchasereceiptRecordMainService { * @param pitemCode 零件号 * @return */ - public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String psupplierCode, String pNumber,String ppoLine, String pitemCode); + PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String psupplierCode, String pNumber,String ppoLine, String pitemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java index 7590ec25..cbe629cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java @@ -4,11 +4,8 @@ import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainUpdateReqVO; -import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordMainConvert; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper; @@ -17,12 +14,8 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; -import java.util.Collection; import java.util.List; -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS; - /** * 采购收货记录主 Service 实现类 * @@ -38,50 +31,10 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco @Resource private PurchasereceiptRecordDetailMapper purchasereceiptRecordDetailMapper; - @Override - public Long createPurchasereceiptRecordMain(PurchasereceiptRecordMainCreateReqVO createReqVO) { - // 插入 - PurchasereceiptRecordMainDO purchasereceiptRecordMain = PurchasereceiptRecordMainConvert.INSTANCE.convert(createReqVO); - purchasereceiptRecordMainMapper.insert(purchasereceiptRecordMain); - // 返回 - return purchasereceiptRecordMain.getId(); - } - - @Override - public void updatePurchasereceiptRecordMain(PurchasereceiptRecordMainUpdateReqVO updateReqVO) { - // 校验存在 - validatePurchasereceiptRecordMainExists(updateReqVO.getId()); - // 更新 - PurchasereceiptRecordMainDO updateObj = PurchasereceiptRecordMainConvert.INSTANCE.convert(updateReqVO); - purchasereceiptRecordMainMapper.updateById(updateObj); - } - - @Override - public void deletePurchasereceiptRecordMain(Long id) { - // 校验存在 - validatePurchasereceiptRecordMainExists(id); - // 删除 - purchasereceiptRecordMainMapper.deleteById(id); - } - - private void validatePurchasereceiptRecordMainExists(Long id) { - if (purchasereceiptRecordMainMapper.selectById(id) == null) { - throw exception(PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS); - } - } @Override public PageResult getPurchasereceiptRecordMainSenior(CustomConditions conditions) { return purchasereceiptRecordMainMapper.selectSenior(conditions); } - @Override - public PurchasereceiptRecordMainDO getPurchasereceiptRecordMain(Long id) { - return purchasereceiptRecordMainMapper.selectById(id); - } - - @Override - public List getPurchasereceiptRecordMainList(Collection ids) { - return purchasereceiptRecordMainMapper.selectBatchIds(ids); - } @Override public PageResult getPurchasereceiptRecordMainPage(PurchasereceiptRecordMainPageReqVO pageReqVO) { @@ -100,23 +53,23 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco @Override public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String psupplierCode,String pNumber,String ppoLine,String pitemCode){ - QueryWrapper queryWrapperMain = new QueryWrapper(); + QueryWrapper queryWrapperMain = new QueryWrapper<>(); queryWrapperMain.eq("number",pNumber); queryWrapperMain.eq("supplier_code",psupplierCode); queryWrapperMain.eq("available","TRUE"); PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectOne(queryWrapperMain); - if(purchasereceiptRecordMainDO != null){ - QueryWrapper queryWrapperDetail = new QueryWrapper(); + if(purchasereceiptRecordMainDO != null) { + QueryWrapper queryWrapperDetail = new QueryWrapper<>(); queryWrapperDetail.eq("po_number",ppoNumber); queryWrapperDetail.eq("po_line",ppoLine); queryWrapperDetail.eq("item_code",pitemCode); PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordDetailMapper.selectOne(queryWrapperDetail); - if(purchasereceiptRecordDetailDO != null){ + if(purchasereceiptRecordDetailDO != null) { return purchasereceiptRecordDetailDO; - }else { + } else { throw new UtilException( "采购收货记录明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效"); } - }else { + } else { throw new UtilException( "采购收货记录无效" + pNumber + "无效"); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java index da83fb9b..d4d15bb4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java @@ -24,8 +24,7 @@ import javax.annotation.Resource; import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.ITEMBASIC_UOM_EXCEPTION; -import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASERECEIPT_REQUEST_DETAIL_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.*; /** * 采购收货申请子 Service 实现类 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index a64be2c3..e6d6f768 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -12,6 +12,7 @@ import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; +import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailCreateReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO; @@ -20,6 +21,8 @@ import com.win.module.wms.controller.purchasereceiptRequest.vo.*; import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert; import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobMainConvert; +import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert; +import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordMainConvert; import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert; import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; @@ -32,16 +35,17 @@ import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptR import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobDetailMapper; import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobMainMapper; +import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper; +import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordMainMapper; import com.win.module.wms.dal.mysql.purchasereceiptRequest.PurchasereceiptRequestDetailMapper; import com.win.module.wms.dal.mysql.purchasereceiptRequest.PurchasereceiptRequestMainMapper; import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.enums.request.RequestStatusState; +import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.itempackaging.ItempackagingService; import com.win.module.wms.service.purchase.PurchaseMainService; -import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordDetailService; -import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService; import com.win.module.wms.service.requestsetting.RequestsettingService; import com.win.module.wms.service.rule.RuleService; import com.win.module.wms.service.shift.ShiftService; @@ -103,9 +107,11 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq @Resource private PurchaseMainService purchaseMainService; @Resource - private PurchasereceiptRecordMainService purchasereceiptRecordMainService; + private PurchasereceiptRecordMainMapper purchasereceiptRecordMainMapper; @Resource - private PurchasereceiptRecordDetailService purchasereceiptRecordDetailService; + private PurchasereceiptRecordDetailMapper purchasereceiptRecordDetailMapper; + @Resource + private ExpectinService expectinService; @Override @Transactional @@ -126,6 +132,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq mainDO.setAutoCommit(requestsettingDO.getAutoCommit()); mainDO.setAutoAgree(requestsettingDO.getAutoAgree()); mainDO.setAutoExecute(requestsettingDO.getAutoExecute()); + mainDO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); //调用自动执行方法 if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { this.generateJob(mainDO, subDOList); @@ -257,6 +264,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq mainDO.setAutoCommit(requestsettingDO.getAutoCommit()); mainDO.setAutoAgree(requestsettingDO.getAutoAgree()); mainDO.setAutoExecute(requestsettingDO.getAutoExecute()); + mainDO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); for (PurchasereceiptRequestDetailDO detailDO : subDOList) { detailDO.setMasterId(mainDO.getId()); detailDO.setNumber(number); @@ -317,7 +325,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.submit(mainDO.getAutoAgree(), mainDO.getAutoExecute()); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); + throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_SUBMIT); } mainDO.setStatus(requestStatusState.getState().getCode()); //调用自动执行方法 @@ -336,7 +344,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.agree(mainDO.getAutoExecute()); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); + throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_AGREE); } mainDO.setStatus(requestStatusState.getState().getCode()); //调用自动执行方法 @@ -355,7 +363,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.handle(); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); + throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_HANDLE); } mainDO.setStatus(requestStatusState.getState().getCode()); //调用执行方法 @@ -372,7 +380,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.reject(); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); + throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_ABORT); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "purchasereceiptRequest", "审批拒绝了采购收货申请", TrendsTypeEnum.UPDATE); @@ -412,9 +420,8 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq * @param detailDOList 采购收货子 */ private void generateJob(PurchasereceiptRequestMainDO mainDO, List detailDOList) { - RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("PurchaseReceiptRequest"); //跳过任务直接生成记录 - if("TRUE".equals(requestsettingDO.getDirectCreateRecord())) { + if("TRUE".equals(mainDO.getDirectCreateRecord())) { PurchasereceiptRecordMainCreateReqVO purchasereceiptRecordMainCreateReqVO = new PurchasereceiptRecordMainCreateReqVO(); BeanUtils.copyProperties(mainDO, purchasereceiptRecordMainCreateReqVO); purchasereceiptRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); @@ -423,12 +430,12 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq //增加业务类型 BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptRecord"); purchasereceiptRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); - purchasereceiptRecordMainService.createPurchasereceiptRecordMain(purchasereceiptRecordMainCreateReqVO); + purchasereceiptRecordMainMapper.insert(PurchasereceiptRecordMainConvert.INSTANCE.convert(purchasereceiptRecordMainCreateReqVO)); for(PurchasereceiptRequestDetailDO purchasereceiptRequestDetailDO : detailDOList) { PurchasereceiptRecordDetailCreateReqVO purchasereceiptRecordDetailCreateReqVO = new PurchasereceiptRecordDetailCreateReqVO(); BeanUtils.copyProperties(purchasereceiptRequestDetailDO, purchasereceiptRecordDetailCreateReqVO); purchasereceiptRecordDetailCreateReqVO.setNumber(number); - purchasereceiptRecordDetailService.createPurchasereceiptRecordDetail(purchasereceiptRecordDetailCreateReqVO); + purchasereceiptRecordDetailMapper.insert(PurchasereceiptRecordDetailConvert.INSTANCE.convert(purchasereceiptRecordDetailCreateReqVO)); } return; } @@ -501,6 +508,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq subList.add(purchasereceiptJobDetailCreateReqVO); } } + List expectinCreateReqVOList = new ArrayList<>(); //把任务插入数据库 for(PurchasereceiptJobMainCreateReqVO purchasereceiptJobMainCreateReqVO : purchasereceiptJobMainCreateReqVOList) { PurchasereceiptJobMainDO purchasereceiptJobMainDO = PurchasereceiptJobMainConvert.INSTANCE.convert(purchasereceiptJobMainCreateReqVO); @@ -517,8 +525,15 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq purchasereceiptJobDetailDO.setNumber(number); purchasereceiptJobDetailDO.setMasterId(purchasereceiptJobMainDO.getId()); purchasereceiptJobDetailDOList.add(purchasereceiptJobDetailDO); + //预计入 + ExpectinCreateReqVO expectinCreateReqVO = new ExpectinCreateReqVO(); + BeanUtils.copyProperties(purchasereceiptJobDetailDO, expectinCreateReqVO); + expectinCreateReqVO.setJobNumber(number); + expectinCreateReqVOList.add(expectinCreateReqVO); } purchasereceiptJobDetailMapper.insertBatch(purchasereceiptJobDetailDOList); + //增加预计入 + expectinService.createExpectin(expectinCreateReqVOList); trendsApi.createTrends(purchasereceiptJobMainDO.getId(), "purchasereceiptJob", "采购收货申请生成采购收货任务", TrendsTypeEnum.CREATE); } } @@ -534,7 +549,8 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq ValidationUtils.validate(validator, mainDo); } catch (Exception ex) { message.append(ex.getMessage()).append(","); - }try { + } + try { this.validateSupplier(mainDo); } catch (Exception ex) { message.append(ex.getMessage()).append(","); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java index 088f728b..982c9c26 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java @@ -61,7 +61,7 @@ public interface SalepriceService { * @param ids 编号 * @return 销售价格单列表 */ - List getSalepriceList(Collection ids); + List getSalepriceList(CustomConditions conditions); /** * 获得销售价格单分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java index 262cf907..a4a2bcb7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java @@ -74,8 +74,8 @@ public class SalepriceServiceImpl implements SalepriceService { } @Override - public List getSalepriceList(Collection ids) { - return salepriceMapper.selectBatchIds(ids); + public List getSalepriceList(CustomConditions conditions) { + return salepriceMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java index 87b28e71..f5f5d5c0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java @@ -62,7 +62,7 @@ public interface StdcostpriceService { * @param ids 编号 * @return 标准成本价格单列表 */ - List getStdcostpriceList(Collection ids); + List getStdcostpriceList(CustomConditions conditions); /** * 获得标准成本价格单分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java index 8bcefb5f..11c454cb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java @@ -78,8 +78,8 @@ public class StdcostpriceServiceImpl implements StdcostpriceService { } @Override - public List getStdcostpriceList(Collection ids) { - return stdcostpriceMapper.selectBatchIds(ids); + public List getStdcostpriceList(CustomConditions conditions) { + return stdcostpriceMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java index 4d968825..10b5c947 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java @@ -57,7 +57,7 @@ public interface SupplierService { * @param ids 编号 * @return 供应商列表 */ - List getSupplierList(Collection ids); + List getSupplierList(CustomConditions conditions); /** * 获得供应商分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java index f8c5a2ea..e8a8036e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java @@ -72,8 +72,8 @@ public class SupplierServiceImpl implements SupplierService { } @Override - public List getSupplierList(Collection ids) { - return supplierMapper.selectBatchIds(ids); + public List getSupplierList(CustomConditions conditions) { + return supplierMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java index 3d3320c9..7860067f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java @@ -63,7 +63,7 @@ public interface SupplieritemService { * @param ids 编号 * @return 供应商物品列表 */ - List getSupplieritemList(Collection ids); + List getSupplieritemList(CustomConditions conditions); /** * 获得供应商物品分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java index 61c4c3a6..030c7584 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java @@ -78,8 +78,8 @@ public class SupplieritemServiceImpl implements SupplieritemService { } @Override - public List getSupplieritemList(Collection ids) { - return supplieritemMapper.selectBatchIds(ids); + public List getSupplieritemList(CustomConditions conditions) { + return supplieritemMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java index 35516d41..70eb13e3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java @@ -55,10 +55,10 @@ public interface SystemcalendarService { /** * 获得系统日历列表 * - * @param ids 编号 + * @param conditions 编号 * @return 系统日历列表 */ - List getSystemcalendarList(Collection ids); + List getSystemcalendarList(CustomConditions conditions); /** * 获得系统日历分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java index de419b03..d437b4ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java @@ -70,8 +70,8 @@ public class SystemcalendarServiceImpl implements SystemcalendarService { } @Override - public List getSystemcalendarList(Collection ids) { - return systemcalendarMapper.selectBatchIds(ids); + public List getSystemcalendarList(CustomConditions conditions) { + return systemcalendarMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java index fa5251da..aaf5c514 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java @@ -33,7 +33,7 @@ public interface TransactionService { * @param transferlogCreateReqVOList 库存转移日志信息 * @return 编号 */ - Integer createTransaction(@Valid List transactionCreateReqVOList, List transferlogCreateReqVOList); + Integer createTransactionAndTransferlog(@Valid List transactionCreateReqVOList, List transferlogCreateReqVOList); /** * 获得用高级搜索库存事务分页列表 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java index 6810a64e..f8ef3ff5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java @@ -71,7 +71,7 @@ public class TransactionServiceImpl implements TransactionService { @Override @Transactional - public Integer createTransaction(List transactionCreateReqVOList, List transferlogCreateReqVOList) { + public Integer createTransactionAndTransferlog(List transactionCreateReqVOList, List transferlogCreateReqVOList) { int result = 0; for(TransactionCreateReqVO createReqVO : transactionCreateReqVOList) { TransactionDO transactionDO = TransactionConvert.INSTANCE.convert(createReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java index 4e8faf06..11075e20 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java @@ -60,7 +60,7 @@ public interface WarehouseService { * @param ids 编号 * @return 仓库列表 */ - List getWarehouseList(Collection ids); + List getWarehouseList(CustomConditions conditions); /** * 获得仓库分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java index 98f4c1b6..0a82c6ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java @@ -76,8 +76,8 @@ public class WarehouseServiceImpl implements WarehouseService { } @Override - public List getWarehouseList(Collection ids) { - return warehouseMapper.selectBatchIds(ids); + public List getWarehouseList(CustomConditions conditions) { + return warehouseMapper.selectSeniorList(conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java index 41302a42..01c0f968 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java @@ -57,10 +57,10 @@ public interface WorkshopService { /** * 获得车间列表 * - * @param ids 编号 + * @param conditions 编号 * @return 车间列表 */ - List getWorkshopList(Collection ids); + List getWorkshopList(CustomConditions conditions); /** * 获得车间分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java index 99b7ff01..f8fe0a32 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java @@ -69,8 +69,8 @@ public class WorkshopServiceImpl implements WorkshopService { } @Override - public List getWorkshopList(Collection ids) { - return workshopMapper.selectBatchIds(ids); + public List getWorkshopList(CustomConditions conditions) { + return workshopMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java index ac7ac1df..ff09ec95 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java @@ -58,10 +58,10 @@ public interface WorkstationService { /** * 获得工位列表 * - * @param ids 编号 + * @param conditions 编号 * @return 工位列表 */ - List getWorkstationList(Collection ids); + List getWorkstationList(CustomConditions conditions); /** * 获得工位分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java index a41e681e..47858c15 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java @@ -72,8 +72,8 @@ public class WorkstationServiceImpl implements WorkstationService { } @Override - public List getWorkstationList(Collection ids) { - return workstationMapper.selectBatchIds(ids); + public List getWorkstationList(CustomConditions conditions) { + return workstationMapper.selectSeniorList(conditions); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java index c58da913..eaa3a10b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java @@ -670,8 +670,7 @@ public class JobUtils { * @return */ public List fromInventoryEffective(String itemCode, String packingNumber, String batch, String locationCode, List inventoryStatus) { - List balanceDOList = new ArrayList(); - balanceDOList = selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, locationCode, inventoryStatus); + List balanceDOList = selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, locationCode, inventoryStatus); return balanceDOList; }