diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnTypeEnum.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnTypeEnum.java index 528ef8c..80abbb3 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnTypeEnum.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnTypeEnum.java @@ -22,12 +22,16 @@ public enum AsnTypeEnum { PJC(3, "配件拆托入库"), + + //模具 SC(4, "生产入库"), WX(5, "维修入库"), QC(6, "期初入库"), + QT(7, "其他入库"), + ; @@ -54,7 +58,8 @@ public enum AsnTypeEnum { AsnTypeEnum.PJC.getValue(), AsnTypeEnum.SC.getValue(), AsnTypeEnum.WX.getValue(), - AsnTypeEnum.QC.getValue() + AsnTypeEnum.QC.getValue(), + AsnTypeEnum.QT.getValue() ); } diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/PickTypeEnum.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/PickTypeEnum.java index a56f063..8640d6d 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/PickTypeEnum.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/PickTypeEnum.java @@ -28,6 +28,8 @@ public enum PickTypeEnum { DJ(8, "点检出库"), + QT(9, "其他出库"), + ; PickTypeEnum(Integer value, String desc) { @@ -53,7 +55,8 @@ public enum PickTypeEnum { PickTypeEnum.SC.getValue(), PickTypeEnum.BF.getValue(), PickTypeEnum.WX.getValue(), - PickTypeEnum.DJ.getValue() + PickTypeEnum.DJ.getValue(), + PickTypeEnum.QT.getValue() ); } diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/impl/PickDetailServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/impl/PickDetailServiceImpl.java index 1d5042d..25d8174 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/impl/PickDetailServiceImpl.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/impl/PickDetailServiceImpl.java @@ -163,8 +163,8 @@ public class PickDetailServiceImpl extends ServiceImpl pickDetails) { - if (pickDetails == null) { - pickDetails = new ArrayList<>(); + if (CollectionUtils.isEmpty(pickDetails)) { + return; } // 计算各种数量