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 9247e63c..4fd1d97e 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 @@ -377,6 +377,7 @@ public interface ErrorCodeConstants { ErrorCode PURCHASECLAIM_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_064_000, "采购索赔申请主不存在"); //采购索赔申请主ErrorCode ErrorCode PURCHASECLAIM_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_064_001, "采购索赔申请子不存在"); + ErrorCode PURCHASECLAIM_REQUEST_MAIN_EXISTS = new ErrorCode(1_000_064_002, "采购索赔申请主已存在"); //采购索赔记录主ErrorCode ErrorCode PURCHASECLAIM_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_065_000, "采购索赔记录主不存在"); //采购索赔记录子ErrorCode diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailBaseVO.java index 467be3f3..e2f8fdef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailBaseVO.java @@ -38,6 +38,12 @@ public class DemandforecastingDetailBaseVO { @NotNull(message = "物品代码不能为空") private String itemCode; + @Schema(description = "订单号") + private String poNumber; + + @Schema(description = "订单行") + private String poLine; + @Schema(description = "备注") private String remark; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExcelVO.java index 47333299..5206c022 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExcelVO.java @@ -34,6 +34,12 @@ public class DemandforecastingDetailExcelVO { @ExcelProperty("物品代码") private String itemCode; + @ExcelProperty("订单号") + private String poNumber; + + @ExcelProperty("订单行") + private String poLine; + @ExcelProperty("备注") private String remark; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExportReqVO.java index bc3c1ba8..e977c4dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExportReqVO.java @@ -28,6 +28,12 @@ public class DemandforecastingDetailExportReqVO { @Schema(description = "物品代码") private String itemCode; + @Schema(description = "订单号") + private String poNumber; + + @Schema(description = "订单行") + private String poLine; + @Schema(description = "备注") private String remark; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailPageReqVO.java index 9009803f..ec2aa30c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailPageReqVO.java @@ -30,6 +30,12 @@ public class DemandforecastingDetailPageReqVO extends PageParam { @Schema(description = "物品代码") private String itemCode; + @Schema(description = "订单号") + private String poNumber; + + @Schema(description = "订单行") + private String poLine; + @Schema(description = "备注") private String remark; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailBaseVO.java index 9ee7d5c6..f472960a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailBaseVO.java @@ -72,7 +72,7 @@ public class InventorychangeRequestDetailBaseVO { private LocalDateTime fromExpireDate; @Schema(description = "从库存状态") - private String frominventoryStatus; + private String fromInventoryStatus; @Schema(description = "到数量") private BigDecimal toQty; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExcelVO.java index 3d980f91..5369bdb0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExcelVO.java @@ -66,7 +66,7 @@ public class InventorychangeRequestDetailExcelVO { @ExcelProperty(value = "从库存状态", converter = DictConvert.class) @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 - private String frominventoryStatus; + private String fromInventoryStatus; @ExcelProperty("到数量") private BigDecimal toQty; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExportReqVO.java index 1889a84c..dad5f5eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExportReqVO.java @@ -55,7 +55,7 @@ public class InventorychangeRequestDetailExportReqVO { private LocalDateTime[] fromExpireDate; @Schema(description = "从库存状态") - private String frominventoryStatus; + private String fromInventoryStatus; @Schema(description = "到数量") private BigDecimal toQty; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailPageReqVO.java index a8ba18be..8618a95f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailPageReqVO.java @@ -57,7 +57,7 @@ public class InventorychangeRequestDetailPageReqVO extends PageParam { private LocalDateTime[] fromExpireDate; @Schema(description = "从库存状态") - private String frominventoryStatus; + private String fromInventoryStatus; @Schema(description = "到数量") private BigDecimal toQty; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainBaseVO.java index 676195c6..fd175b5f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainBaseVO.java @@ -23,9 +23,9 @@ public class ProductionreceiptRecordMainBaseVO { @Schema(description = "id", example = "id") private Long id; - @Schema(description = "发料任务单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "发料任务单号不能为空") - private String issueJobNumber; + @Schema(description = "发料记录单号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "发料记录单号不能为空") + private String issueRecordNumber; @Schema(description = "任务单号") private String jobNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java index e9925768..5a3b95e5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java @@ -22,8 +22,8 @@ import com.win.framework.excel.core.convert.DictConvert; @Data public class ProductionreceiptRecordMainExcelVO { - @ExcelProperty("发料任务单号") - private String issueJobNumber; + @ExcelProperty("发料记录单号") + private String issueRecordNumber; @ExcelProperty("任务单号") private String jobNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExportReqVO.java index 0c13a8cb..b9b3cf3c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExportReqVO.java @@ -13,8 +13,8 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @Data public class ProductionreceiptRecordMainExportReqVO { - @Schema(description = "发料任务单号") - private String issueJobNumber; + @Schema(description = "发料记录单号") + private String issueRecordNumber; @Schema(description = "任务单号") private String jobNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainPageReqVO.java index 1787e6b8..efc26d5f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainPageReqVO.java @@ -15,8 +15,8 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @ToString(callSuper = true) public class ProductionreceiptRecordMainPageReqVO extends PageParam { - @Schema(description = "发料任务单号") - private String issueJobNumber; + @Schema(description = "发料记录单号") + private String issueRecordNumber; @Schema(description = "任务单号") private String jobNumber; 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 3aeb6ca0..f01180bc 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 @@ -72,6 +72,9 @@ public class ProductreceiptRequestDetailBaseVO { @Schema(description = "物品代码") private String itemCode; + @Schema(description = "来源库位") + private String fromLocationCode; + @Schema(description = "备注") private String remark; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExcelVO.java index 02fd7fe3..d7362ae0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExcelVO.java @@ -69,6 +69,9 @@ public class ProductreceiptRequestDetailExcelVO { @ExcelProperty("物品代码") private String itemCode; + @ExcelProperty("到库位代码") + private String toLocationCode; + @ExcelProperty("备注") private String remark; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExportReqVO.java index b6ba074d..926f867c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExportReqVO.java @@ -62,6 +62,9 @@ public class ProductreceiptRequestDetailExportReqVO { @Schema(description = "物品代码") private String itemCode; + @Schema(description = "到库位代码") + private String toLocationCode; + @Schema(description = "备注") private String remark; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailPageReqVO.java index 5bbe1aff..e34e905a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailPageReqVO.java @@ -64,6 +64,9 @@ public class ProductreceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "物品代码") private String itemCode; + @Schema(description = "到库位代码") + private String toLocationCode; + @Schema(description = "备注") private String remark; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java index f7925d30..86609b2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java @@ -119,9 +119,9 @@ public class PurchaseclaimRequestMainController { //组装vo Map mapDropDown = new HashMap<>(); String[] purchaseReturnReason = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PURCHASE_RETURN_REASON); - mapDropDown.put(16, purchaseReturnReason); + mapDropDown.put(6, purchaseReturnReason); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); - mapDropDown.put(25, uom); + mapDropDown.put(10, uom); List resultList = new ArrayList<>(); for(PurchaseclaimRequestMainDO mainDO : list) { List subList = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetailList(mainDO.getId()); @@ -141,9 +141,9 @@ public class PurchaseclaimRequestMainController { List list = new ArrayList<>(); Map mapDropDown = new HashMap<>(); String[] purchaseReturnReason = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PURCHASE_RETURN_REASON); - mapDropDown.put(16, purchaseReturnReason); + mapDropDown.put(6, purchaseReturnReason); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); - mapDropDown.put(25, uom); + mapDropDown.put(10, uom); // 输出 ExcelUtils.write(response, "采购索赔信息导入模板.xlsx", "采购索赔信息列表", PurchaseclaimRequestImportVO.class, list, mapDropDown); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailBaseVO.java index a562f5ad..45beed51 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailBaseVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchaseclaimRequest.vo; +import com.win.framework.excel.core.annotations.OnlyOne; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportVO.java index c8d4cab6..a4fd6c08 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportVO.java @@ -28,47 +28,15 @@ public class PurchaseclaimRequestImportVO { @ExcelProperty("发货单号") private String asnNumber; - @ExcelProperty("要货计划单号") - private String ppNumber; - @ExcelProperty("供应商代码") private String supplierCode; @ExcelProperty("单据号") private String number; - @ExcelProperty("业务类型") - private String businessType; - - @ExcelProperty("申请时间") - @ColumnWidth(value = 16) - private LocalDateTime requestTime; - - @ExcelProperty("截止时间") - @ColumnWidth(value = 16) - private LocalDateTime dueTime; - - @ExcelProperty("部门") - private String departmentCode; - - @ExcelProperty("自动提交") - private String autoCommit; - - @ExcelProperty("自动通过") - private String autoAgree; - - @ExcelProperty("自动执行") - private String autoExecute; - - @ExcelProperty("直接生成记录") - private String directCreateRecord; - @ExcelProperty("批次") private String batch; - @ExcelProperty("替代批次") - private String altBatch; - @ExcelProperty("订单号") private String poNumber; @@ -82,24 +50,9 @@ public class PurchaseclaimRequestImportVO { @ExcelProperty("单价") private BigDecimal singlePrice; - @ExcelProperty("金额") - private BigDecimal amount; - @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; @@ -107,7 +60,4 @@ public class PurchaseclaimRequestImportVO { @DictFormat(DictTypeConstants.UOM) private String uom; - @ExcelProperty("备注") - private String remark; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailBaseVO.java index 93ee3206..a2f0e337 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailBaseVO.java @@ -105,7 +105,7 @@ public class PurchasereceiptJobDetailBaseVO { private String number; @Schema(description = "备注") - private String eemark; + private String remark; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailBaseVO.java index 4253a06b..c2a4eb08 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailBaseVO.java @@ -2,10 +2,8 @@ package com.win.module.wms.controller.purchasereturnRequest.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; import java.time.LocalDateTime; import java.math.BigDecimal; -import java.time.LocalDateTime; import javax.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; @@ -32,6 +30,9 @@ public class PurchasereturnRequestDetailBaseVO { @NotNull(message = "批次不能为空") private String batch; + @Schema(description = "来源库位") + private String fromLocationCode; + @Schema(description = "替代批次") private String altBatch; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExcelVO.java index 13861968..b319880b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExcelVO.java @@ -29,6 +29,9 @@ public class PurchasereturnRequestDetailExcelVO { @ExcelProperty("批次") private String batch; + @ExcelProperty( "来源库位") + private String fromLocationCode; + @ExcelProperty("替代批次") private String altBatch; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java index 42492a18..5b86210d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java @@ -24,6 +24,9 @@ public class PurchasereturnRequestDetailExportReqVO { @Schema(description = "批次") private String batch; + @Schema(description = "来源库位") + private String fromLocationCode; + @Schema(description = "替代批次") private String altBatch; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailPageReqVO.java index 169af828..aba301b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailPageReqVO.java @@ -26,6 +26,9 @@ public class PurchasereturnRequestDetailPageReqVO extends PageParam { @Schema(description = "批次") private String batch; + @Schema(description = "来源库位") + private String fromLocationCode; + @Schema(description = "替代批次") private String altBatch; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestDetailConvert.java index 9847f521..49506fa1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestDetailConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestDetailConvert.java @@ -26,6 +26,7 @@ public interface PurchaseclaimRequestDetailConvert { PurchaseclaimRequestDetailDO convert(PurchaseclaimRequestDetailUpdateReqVO bean); PurchaseclaimRequestDetailRespVO convert(PurchaseclaimRequestDetailDO bean); + PurchaseclaimRequestDetailCreateReqVO convert1(PurchaseclaimRequestDetailDO bean); List convertList(List list); @@ -49,7 +50,6 @@ public interface PurchaseclaimRequestDetailConvert { @Mappings({ @Mapping(source = "mainVo.number", target = "number"), - @Mapping(source = "mainVo.remark", target = "remark"), }) PurchaseclaimRequestImportErrorVO convert(PurchaseclaimRequestMainCreateReqVO mainVo, PurchaseclaimRequestDetailCreateReqVO detailVo); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/demandforecasting/DemandforecastingDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/demandforecasting/DemandforecastingDetailDO.java index 1d49f942..b7f5f7e8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/demandforecasting/DemandforecastingDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/demandforecasting/DemandforecastingDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.demandforecasting; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -50,6 +51,14 @@ public class DemandforecastingDetailDO extends BaseDO { * 物品代码 */ private String itemCode; + /** + * 订单号 + */ + private String poNumber; + /** + * 订单行 + */ + private String poLine; /** * 备注 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestDetailDO.java index ed8aa8a8..3781e464 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.inventorychangeRequest; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.math.BigDecimal; @@ -88,7 +89,7 @@ public class InventorychangeRequestDetailDO extends BaseDO { * * 枚举 {@link TODO inventory_status 对应的类} */ - private String frominventoryStatus; + private String fromInventoryStatus; /** * 到数量 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordMainDO.java index 2b5f0b18..2a6ea6d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordMainDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.productionreceiptRecord; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -30,9 +31,9 @@ public class ProductionreceiptRecordMainDO extends BaseDO { @TableId private Long id; /** - * 发料任务单号 + * 发料记录单号 */ - private String issueJobNumber; + private String issueRecordNumber; /** * 任务单号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java index f2acbba2..ebb2346a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.productreceiptRequest; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -101,6 +102,10 @@ public class ProductreceiptRequestDetailDO extends BaseDO { * 物品代码 */ private String itemCode; + /** + * 到库位代码 + */ + private String toLocationCode; /** * 备注 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobDetailDO.java index a3a9fa3e..660497db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.purchasereceiptJob; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -139,7 +140,7 @@ public class PurchasereceiptJobDetailDO extends BaseDO { /** * 主表ID */ - private Long masterID; + private Long masterId; /** * 单据号 */ @@ -147,7 +148,7 @@ public class PurchasereceiptJobDetailDO extends BaseDO { /** * 备注 */ - private String eemark; + private String remark; /** * 地点ID */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestDetailDO.java index 1d78fce7..79c80240 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.purchasereturnRequest; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -39,6 +40,10 @@ public class PurchasereturnRequestDetailDO extends BaseDO { * 批次 */ private String batch; + /** + * 来源库位 + */ + private String fromLocationCode; /** * 替代批次 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingDetailMapper.java index 9dfd1b43..3e6edf0d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/demandforecasting/DemandforecastingDetailMapper.java @@ -26,6 +26,8 @@ public interface DemandforecastingDetailMapper extends BaseMapperX selectPage(ProductionreceiptRecordMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ProductionreceiptRecordMainDO::getIssueJobNumber, reqVO.getIssueJobNumber()) + .eqIfPresent(ProductionreceiptRecordMainDO::getIssueRecordNumber, reqVO.getIssueRecordNumber()) .eqIfPresent(ProductionreceiptRecordMainDO::getJobNumber, reqVO.getJobNumber()) .eqIfPresent(ProductionreceiptRecordMainDO::getWorkshopCode, reqVO.getWorkshopCode()) .eqIfPresent(ProductionreceiptRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType()) @@ -56,7 +56,7 @@ public interface ProductionreceiptRecordMainMapper extends BaseMapperX selectList(ProductionreceiptRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(ProductionreceiptRecordMainDO::getIssueJobNumber, reqVO.getIssueJobNumber()) + .eqIfPresent(ProductionreceiptRecordMainDO::getIssueRecordNumber, reqVO.getIssueRecordNumber()) .eqIfPresent(ProductionreceiptRecordMainDO::getJobNumber, reqVO.getJobNumber()) .eqIfPresent(ProductionreceiptRecordMainDO::getWorkshopCode, reqVO.getWorkshopCode()) .eqIfPresent(ProductionreceiptRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java index 61348d2f..57254e9f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java @@ -37,6 +37,7 @@ public interface ProductreceiptRequestDetailMapper extends BaseMapperX importItembasicList(List importItembasics, Integer mode,boolean updatePart); /** + * BQ----QI * 获得物品基本信息 * * @param code 物品代码 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 60e9ca93..510a000f 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 @@ -347,8 +347,12 @@ public class ItembasicServiceImpl implements ItembasicService { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code); ItembasicDO itembasicDO = itembasicMapper.selectOne(queryWrapper); - if(itembasicDO != null || "ENABLE".equals(itembasicDO.getStatus())){ - return itembasicDO; + if(itembasicDO != null){ + if("ENABLE".equals(itembasicDO.getStatus())){ + return itembasicDO; + }else { + throw exception(ITEMBASIC_NOT_EXISTS); + } }else { throw exception(ITEMBASIC_NOT_EXISTS); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java index f19cc68c..656fd473 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java @@ -1,29 +1,39 @@ package com.win.module.wms.service.purchaseclaimRequest; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.exceptions.UtilException; 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.system.api.serialnumber.SerialNumberApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.purchaseclaimRequest.vo.*; import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestDetailConvert; import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestMainConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO; import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO; import com.win.module.wms.dal.mysql.purchaseclaimRequest.PurchaseclaimRequestDetailMapper; import com.win.module.wms.dal.mysql.purchaseclaimRequest.PurchaseclaimRequestMainMapper; import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.service.itembasic.ItembasicService; +import com.win.module.wms.service.purchase.PurchaseMainService; +import com.win.module.wms.service.supplier.SupplierService; +import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import javax.validation.Validator; +import java.math.BigDecimal; import java.util.*; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASECLAIM_REQUEST_IMPORT_LIST_IS_EMPTY; -import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASECLAIM_REQUEST_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.*; + /** * 采购索赔申请主 Service 实现类 @@ -43,6 +53,20 @@ public class PurchaseclaimRequestMainServiceImpl implements PurchaseclaimRequest @Resource private SerialNumberApi serialNumberApi; + @Resource + private SupplierService supplierService; + + @Resource + private ItembasicService itembasicService; + + @Resource + private SupplierdeliverRecordMainService supplierdeliverRecordMainService; + @Resource + private PurchaseMainService purchaseMainService; + + @Resource + private Validator validator; + @Override @Transactional public Long createPurchaseclaimRequestMain(PurchaseclaimRequestMainCreateReqVO createReqVO) { @@ -87,8 +111,11 @@ public class PurchaseclaimRequestMainServiceImpl implements PurchaseclaimRequest } private void validatePurchaseclaimRequestMainExists(Long id) { - if (purchaseclaimRequestMainMapper.selectById(id) == null) { - throw exception(PURCHASECLAIM_REQUEST_MAIN_NOT_EXISTS); + PurchaseclaimRequestMainDO purchaseclaimRequestMainDO = purchaseclaimRequestMainMapper.selectById(id); + if (purchaseclaimRequestMainDO == null) { + return; + }else { + throw exception(PURCHASECLAIM_REQUEST_MAIN_EXISTS); } } @@ -117,45 +144,119 @@ public class PurchaseclaimRequestMainServiceImpl implements PurchaseclaimRequest return purchaseclaimRequestMainMapper.selectList(exportReqVO); } + private void selectUomExist(String itemUom,String uom) { + if(itemUom == uom){ + return; + }else { + throw new UtilException("提示单位"+ uom + "错误，应该是" + itemUom); + } + } + + private void ifPlanQtyBigThanOrderQty(String poLine, BigDecimal shippedQty, BigDecimal qty, BigDecimal orderQty) { + if(shippedQty.add(qty).compareTo(orderQty) > 0){ + throw new UtilException("订单行"+ poLine + "的已发货数量" + shippedQty + "+计划数量" + qty + "大于订单数量" + orderQty); + } + } public List importPurchaseclaimRequestList(List datas, Integer mode, boolean updatePart) { if (CollUtil.isEmpty(datas)) { throw exception(PURCHASECLAIM_REQUEST_IMPORT_LIST_IS_EMPTY); } List errorList = new ArrayList<>(); datas.forEach(createReqVO -> { - // 校验，判断是否有不符合的原因，并加入errorList,如果主表则所有子表都加入errorList - boolean isError = false; -// String importRemark = ""; -// try { -// if(mode != null){ -// validatePurchaseclaimRequestMainExists(null); -// } -// } catch (ServiceException ex) { -// isError = true; -// importRemark += ex.getMessage() + ","; -// } -// if(isError) { -// List subList = createReqVO.getSubList(); -// for (PurchaseclaimRequestDetailCreateReqVO detailVo : subList) { -// PurchaseclaimRequestImportErrorVO importVO = PurchaseclaimRequestDetailConvert.INSTANCE.convert(createReqVO, detailVo); -// importVO.setImportStatus("失败"); -// importVO.setImportRemark(importRemark.substring(0, importRemark.length() - 1)); -// } -// } - createReqVO.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增")); - String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_RECORD.getCode()); - createReqVO.setNumber(number); - PurchaseclaimRequestMainDO createObj = PurchaseclaimRequestMainConvert.INSTANCE.convert(createReqVO); - purchaseclaimRequestMainMapper.insert(createObj); - List subList = createReqVO.getSubList(); - List subDOList = PurchaseclaimRequestDetailConvert.INSTANCE.convertList03(subList); - // 新增子表数据 - for (PurchaseclaimRequestDetailDO detailDO : subDOList) { - // 校验，判断是否有不符合的原因，并加入errorList,同主表,只把有错误的子表加入errorList - detailDO.setMasterId(createReqVO.getId()); - detailDO.setNumber(createReqVO.getNumber()); + String messageMain = ""; + int detailErrorCount = 0; + //主表校验方法 + if(mode != null){ + try { + validatePurchaseclaimRequestMainExists(null); + } catch (Exception ex) { + messageMain += ex.getMessage() + ","; + } + try{ + ValidationUtils.validate(validator,createReqVO); + }catch (Exception ex) { + messageMain += ex.getMessage() + ","; + } + try { + supplierService.selectSupplier(createReqVO.getSupplierCode()); + } catch (Exception ex) { + messageMain += ex.getMessage() + ","; + } + PurchaseclaimRequestMainDO createObj = PurchaseclaimRequestMainConvert.INSTANCE.convert(createReqVO); + List subList = createReqVO.getSubList(); + List subDOList = PurchaseclaimRequestDetailConvert.INSTANCE.convertList03(subList); + // 新增子表数据 + for (PurchaseclaimRequestDetailDO detailDO : subDOList) { + String messageDetail = ""; + // 校验，判断是否有不符合的原因，并加入errorList,同主表,只把有错误的子表加入errorList + //子表校验方法 + try { + supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(createReqVO.getSupplierCode(), + detailDO.getNumber(), detailDO.getItemCode(), detailDO.getPoNumber(), detailDO.getPoLine()); + } catch (Exception ex) { + messageDetail += ex.getMessage() + ","; + } + try { + ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDO.getItemCode()); + detailDO.setProjectCode(itembasicDO.getProject()); + try { + selectUomExist(itembasicDO.getUom(), detailDO.getUom()); + } catch (Exception ex) { + messageDetail += ex.getMessage() + ","; + } + } catch (Exception ex) { + messageDetail += ex.getMessage() + ","; + } + try { + PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(detailDO.getNumber(), createReqVO.getSupplierCode() + , detailDO.getItemCode(), detailDO.getPoNumber(), detailDO.getPoLine()); + try { + ifPlanQtyBigThanOrderQty(detailDO.getPoLine(), purchaseDetailDO.getShippedQty(), detailDO.getQty(), purchaseDetailDO.getOrderQty()); + }catch (Exception ex){ + messageDetail += ex.getMessage() + ","; + } + }catch (Exception ex) { + messageDetail += ex.getMessage() + ","; + } + PurchaseclaimRequestDetailCreateReqVO purchaseclaimRequestDetailCreateReqVO = PurchaseclaimRequestDetailConvert.INSTANCE.convert1(detailDO); + PurchaseclaimRequestImportErrorVO importVO = PurchaseclaimRequestDetailConvert.INSTANCE.convert(createReqVO, purchaseclaimRequestDetailCreateReqVO); + //进行子表的错误统计 + if(!messageDetail.isEmpty()){ + detailErrorCount ++; + } + //如果子表没有全错 + if(detailErrorCount != subDOList.size()){ + //主表没有错误 写入库里 + if(messageMain == null){ + createReqVO.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增")); + String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_RECORD.getCode()); + createReqVO.setNumber(number); + + purchaseclaimRequestMainMapper.insert(createObj); + } //反之 跳出本次循环 进行下一个主表的循环 + if(messageMain != null || messageDetail != null) { + importVO.setImportStatus("失败"); + String messageAll = messageMain+ messageDetail; + importVO.setImportRemark(messageAll.substring(0,messageAll.length()-1)); + errorList.add(importVO); + continue; + } + //如果子表没有错误 写库 + if(messageDetail == null){ + detailDO.setNumber(createReqVO.getNumber()); + detailDO.setMasterId(createReqVO.getId()); + detailDO.setAmount(detailDO.getQty().multiply(detailDO.getSinglePrice()).setScale(6,BigDecimal.ROUND_HALF_UP)); + purchaseclaimRequestDetailMapper.insertBatch(subDOList); + } + //如果子表全错 + }else { + importVO.setImportStatus("失败"); + String messageAll = messageMain+ messageDetail; + importVO.setImportRemark(messageAll.substring(0,messageAll.length()-1)); + errorList.add(importVO); + } + } } - purchaseclaimRequestDetailMapper.insertBatch(subDOList); }); return errorList; } 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 43cad474..4be351f2 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 @@ -96,8 +96,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain * @param ppoLine 订单行 * @return 供应商发货记录子 */ - public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String pasnNumber,String pitemCode,String ppoNumber,String ppoLine) { - SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(pasnNumber, pitemCode, ppoNumber, ppoLine); + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode,String pasnNumber,String pitemCode,String ppoNumber,String ppoLine) { + SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(psupplierCode,pasnNumber, pitemCode, ppoNumber, ppoLine); if(supplierdeliverRecordDetailDO != null){ return supplierdeliverRecordDetailDO; }else { 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 ee054664..613545a5 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 @@ -84,10 +84,11 @@ public interface PurchasereceiptRecordMainService { * 查询采购收货记录是否存在 * Record-----VPur * @param ppoNumber 订单号 - * @param pNumber 订单号 + * @param psupplierCode 供应商code + * @param pNumber 单据号 * @param ppoLine 订单行 * @param pitemCode 零件号 * @return */ - public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber, String pNumber,String ppoLine, String pitemCode); + public 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 ee866640..d0193e1c 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 @@ -94,14 +94,14 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco return purchasereceiptRecordMainMapper.selectList(exportReqVO); } @Override - public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String pNumber,String ppoLine,String pitemCode){ + public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String psupplierCode,String pNumber,String ppoLine,String pitemCode){ QueryWrapper queryWrapperMain = new QueryWrapper(); - queryWrapperMain.eq("asn_number",ppoNumber); + queryWrapperMain.eq("number",pNumber); + queryWrapperMain.eq("supplier_code",psupplierCode); PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectOne(queryWrapperMain); if(purchasereceiptRecordMainDO != null && "TRUE".equals(purchasereceiptRecordMainDO.getAvailable())){ QueryWrapper queryWrapperDetail = new QueryWrapper(); queryWrapperDetail.eq("po_number",ppoNumber); - queryWrapperDetail.eq("number",pNumber); queryWrapperDetail.eq("po_line",ppoLine); queryWrapperDetail.eq("item_code",pitemCode); PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordDetailMapper.selectOne(queryWrapperDetail); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 0fd771a0..961fdbe1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -99,8 +99,8 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe * @param ppoLine 订单行 * @return 供应商发货记录子 */ - public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) { - SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(pasnNumber, pitemCode, ppoNumber, ppoLine); + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode,String pnumber, String pitemCode, String ppoNumber, String ppoLine) { + SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(psupplierCode,pnumber, pitemCode, ppoNumber, ppoLine); if(supplierdeliverRecordDetailDO != null){ return supplierdeliverRecordDetailDO; }else {