Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-dependency-common

src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -1413,8 +1413,6 @@ public class Constant {
         PURRETURN_RETURN("入库类型-采退入库"),
         //盘盈入库
         PROFIT("入库类型-盘盈入库"),
-        //销退入库
-        PURRETURN("入库类型-销退入库"),
         //其他入库
         OTHER("入库类型-其他入库");
 
@@ -1445,8 +1443,6 @@ public class Constant {
         SALE("出库类型-销售出库"),
         //销售退货出库
         SALE_RETURN("出库类型-销退出库"),
-        //采退出库
-        PURRETURN("出库类型-采退出库"),
         //盘亏入库
         INVENTORY_LOSS("出库类型-盘亏出库"),
         //其他出库

src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -45,7 +45,7 @@ public enum ErrorCodeEnum {
     INBOUND_CANNOT_BE_EMPTY(4006, "当前入库单不存在"),
     ISEXISTS_CUSPHONE(4007, "当前客户电话已存在"),
     NO_WAIT_INTO(4008, "非待入库单据不能删除"),
-    ITEMQTY_NO_LESS_INTOQTY(4009, "商品数量不能小于入库中数量"),
+    ITEMQTY_NO_LESS_INTOQTY(4009, "商品数量不能小于可转入库数量"),
     ITEMQTY_NO_LESS_OUTQTY(4010, "商品数量不能小于出库中数量"),
     OUTINGQTY_NO_LESS_OUTQTY(4011, "出库中数量不能小于出库数量"),
     INTOINGQTY_NO_LESS_INTOQTY(4012, "入库中数量不能小于入库数量"),