From 1ed730b4898a2bd2e039f82b8a8b0c4a93c6051a Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 15 Nov 2023 18:50:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BF=AE=E6=94=B9=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E5=90=8C=E6=AD=A5=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../win/module/wms/enums/DictTypeConstants.java | 3 +++ .../module/wms/enums/ErrorCodeConstants.java | 1 + .../vo/CountRequestDetailBaseVO.java | 10 ++-------- .../vo/CountRequestDetailExcelVO.java | 11 ++--------- .../vo/CountRequestDetailExportReqVO.java | 11 ++--------- .../vo/CountRequestDetailPageReqVO.java | 9 ++------- .../vo/CustomerreturnRequestDetailExcelVO.java | 3 +++ .../CustomerreturnRequestDetailExportReqVO.java | 3 +++ .../CustomerreturnRequestDetailPageReqVO.java | 3 +++ .../vo/InspectRequestDetailBaseVO.java | 3 +++ .../vo/InspectRequestDetailExcelVO.java | 3 +++ .../vo/InspectRequestDetailExportReqVO.java | 3 +++ .../vo/InspectRequestDetailPageReqVO.java | 3 +++ .../vo/ProductionlineItemImportExcelVO.java | 3 +++ .../vo/ProductionlineitemExcelVO.java | 3 +++ .../vo/ProductreceiptRequestDetailBaseVO.java | 2 ++ .../purchase/vo/PurchaseDetailBaseVO.java | 4 ++++ .../purchase/vo/PurchaseDetailExcelVO.java | 4 ++++ .../purchase/vo/PurchaseDetailExportReqVO.java | 3 +++ .../purchase/vo/PurchaseDetailPageReqVO.java | 2 ++ .../vo/SupplierdeliverRequestDetailBaseVO.java | 6 ------ .../vo/SupplierdeliverRequestDetailExcelVO.java | 6 ------ ...SupplierdeliverRequestDetailExportReqVO.java | 6 ------ .../SupplierdeliverRequestDetailPageReqVO.java | 6 ------ .../vo/SupplierinvoiceRequestDetailBaseVO.java | 14 -------------- .../vo/SupplierinvoiceRequestDetailExcelVO.java | 12 ------------ ...SupplierinvoiceRequestDetailExportReqVO.java | 12 ------------ .../SupplierinvoiceRequestDetailPageReqVO.java | 12 ------------ .../countRequest/CountRequestDetailDO.java | 14 +++----------- .../inspectRequest/InspectRequestDetailDO.java | 9 ++++----- .../dataobject/purchase/PurchaseDetailDO.java | 4 ++++ .../SupplierdeliverRequestDetailDO.java | 9 +-------- .../SupplierinvoiceRequestDetailDO.java | 17 +---------------- .../countRequest/CountRequestDetailMapper.java | 12 ++++-------- .../CustomerreturnRequestDetailMapper.java | 2 ++ .../InspectRequestDetailMapper.java | 2 ++ .../ProductionlineitemMapper.java | 2 ++ .../mysql/purchase/PurchaseDetailMapper.java | 2 ++ .../SupplierdeliverRequestDetailMapper.java | 4 ---- .../SupplierinvoiceRequestDetailMapper.java | 8 -------- .../service/customer/CustomerServiceImpl.java | 3 ++- ...PurchasereceiptRequestDetailServiceImpl.java | 3 +-- 42 files changed, 82 insertions(+), 170 deletions(-) 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 be316794..608066b1 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,7 +65,10 @@ 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";//检验类型 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 9fb522d5..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 @@ -682,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, "发货申请不存在"); 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/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/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 a6b391c3..95d24c6b 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 @@ -68,4 +68,7 @@ public class InspectRequestDetailBaseVO { @Schema(description = "计量单位") private String uom; + @Schema(description = "单据号") + private String number; + } 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 fc7501fa..654a1176 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 @@ -65,6 +65,9 @@ public class InspectRequestDetailExcelVO { @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String uom; + @ExcelProperty("单据号") + private String number; + @ExcelProperty("创建时间") @ColumnWidth(value = 16) private LocalDateTime createTime; 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 eca714ba..e5a91f43 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 @@ -59,4 +59,7 @@ public class InspectRequestDetailExportReqVO { @Schema(description = "计量单位") private String uom; + @Schema(description = "单据号") + private String number; + } 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 467f1861..0690f7a3 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 @@ -64,4 +64,7 @@ public class InspectRequestDetailPageReqVO extends PageParam { @Schema(description = "计量单位") private String uom; + @Schema(description = "单据号") + private String number; + } 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/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/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/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/inspectRequest/InspectRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java index 976173e5..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 @@ -1,12 +1,11 @@ package com.win.module.wms.dal.dataobject.inspectRequest; -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.time.LocalDateTime; import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.*; +import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 检验申请子 DO 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/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/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 selectSenior(CustomConditions conditions) { @@ -73,6 +74,7 @@ public interface CustomerreturnRequestDetailMapper 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()) @@ -42,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()) 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/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/service/customer/CustomerServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java index 944bb5d9..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 @@ -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/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 实现类