koushanshan 2 лет назад
Родитель
Сommit
dd42ef3bbb

+ 12 - 35
src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -1770,30 +1770,22 @@ public class Constant {
      * @date : 2024/3/21 9:04
      */
     public enum InventoryDocCode {
-        OUTBOUND("出库", "t_psi_outbound", "", "", ""),
-        INTOBOUND("入库", "t_psi_inbound", "", "", "");
-        //region todo 看后续是否需要
-//        OTHER_OUTBOUND("其他出库", "t_psi_outbound", "", "", ""),
-//        SALE_ORDER("销售出库", "t_psi_outbound", "", "", ""),
-//        SALE_RETURN("销退出库", "t_psi_outbound", "", "", ""),
-//        INVENTORY_LOSS("盘亏出库", "t_psi_outbound", "", "", ""),
-//        OTHER_INBOUND("其他入库", "t_psi_inbound", "", "", ""),
-//        PURCHASE_ORDER("采购入库", "t_psi_inbound", "", "", ""),
-//        PURCHASE_RETURN("采退入库", "t_psi_inbound", "", "", ""),
-//        INVENTORY_PROFIT("盘盈入库", "t_psi_inbound", "", "", ""),
-//        MOVE("库位移动", "t_psi_transfer", "", "", "");
+        OUTBOUND("出库", "t_psi_outbound"),
+        INTOBOUND("入库", "t_psi_inbound"),
+        OTHER_OUTBOUND("其他出库", "t_psi_outbound"),
+        SALE_ORDER("销售出库", "t_psi_outbound" ),
+        SALE_RETURN("销退出库", "t_psi_outbound" ),
+        INVENTORY_LOSS("盘亏出库", "t_psi_outbound" ),
+        OTHER_INBOUND("其他入库", "t_psi_inbound" ),
+        PURCHASE_ORDER("采购入库", "t_psi_inbound" ),
+        PURCHASE_RETURN("采退入库", "t_psi_inbound" ),
+        INVENTORY_PROFIT("盘盈入库", "t_psi_inbound" ),
+        MOVE("库位移动", "t_psi_transfer" );
         //endregion
         //单据类型名称
         private String value;
         //表名
         private String tableName;
-        //主键
-        private String primaryKey;
-        //有后续业务流程的才需要以下2个属性
-        //feign接口类路径
-        private String feignPath;
-        //feign接口方法名
-        private String methodName;
 
         public String getValue() {
             return value;
@@ -1803,24 +1795,9 @@ public class Constant {
             return tableName;
         }
 
-        public String getPrimaryKey() {
-            return primaryKey;
-        }
-
-        public String getFeignPath() {
-            return feignPath;
-        }
-
-        public String getMethodName() {
-            return methodName;
-        }
-
-        InventoryDocCode(String value, String tableName, String primaryKey, String feignPath, String methodName) {
+        InventoryDocCode(String value, String tableName) {
             this.value = value;
             this.tableName = tableName;
-            this.primaryKey = primaryKey;
-            this.feignPath = feignPath;
-            this.methodName = methodName;
         }
 
         //获取指定的枚举

+ 4 - 1
src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -74,9 +74,12 @@ public enum ErrorCodeEnum {
     QTY_IS_NULL(11095,"当前数据中数量为空!"),
     AMT_IS_NULL(11096,"当前数据中金额为空!"),
     COST_PRICE_IS_NULL(11097,"当前数据中成本单价为空!"),
-    DETAIL_LIST_IS_NUL(11098,"当前数据明细数据为空!"),
+    DETAIL_LIST_IS_NUL(11098,"明细数据为空!"),
     DETAIL_ITEM_ID_IS_NULL(11099,"当前数据中存在明细id为空的数据!"),
     INVENTORY_QUANTITY_HAS_EXCEEDED(11100,"库存数量已超出!"),
+    SKU_IS_NOT_IN_INVENTORY(11101,"当前出库商品中在库存中不存在!"),
+    CAN_OUTBOUND_QUANTITY_INSUFFICIENT(11102,"可出库数量不足!"),
+
 
 
     CUSTOMER_FOLLOW_MEASURE_STATUS_DONE(8007, "当前预约量尺已填写回执"),