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

@@ -872,6 +872,7 @@ public class Constant {
         STAFF("员工档案"),
         CUSTOMER("客户档案"),
         ORDER("销售订单"),
+        ORDEROUT("出库退货"),
         OUTBOUND("出库单"),
         MONEYACCOUNT("资金账号"),
         PURCHASE("采购订单"),
@@ -1156,9 +1157,13 @@ public class Constant {
      */
     public enum DocumentType {
         //采购订单
-        PUR_CHASE("订单类型-采购订单"),
+        PUR_CHASE("单据类型-采购订单"),
         //销售订单
-        ORDER_CHASE("订单类型-采购订单");
+        ORDER("单据类型-销售订单"),
+        //销售退货
+        OUT_RETURN("单据类型-销售退货"),
+        //采购退货
+        INTO_RETURN("单据类型-采购退货");
 
         private String name;
 
@@ -1328,6 +1333,18 @@ public class Constant {
         MONEYACCOUNT("dkic_b","t_mst_money_account"),
         // 数据字典
         DICTIONARYDATA("dkic_b1","t_mst_dictionary_data"),
+        //商品品牌
+        GOODSBRAND("dkic_b1","t_mst_goods_brand"),
+        //商品种类
+        GOODSCATEGORY("dkic_b1","t_mst_goods_category"),
+        //商品系列
+        GOODSSERIES("dkic_b1","t_mst_goods_series"),
+        //计量单位
+        UNIT("dkic_b1","t_mst_unit"),
+        //仓库
+        WAREHOUSE("dkic_b1","t_mst_warehouse"),
+        //销售渠道
+        SALECHANNEL("dkic_b1","t_mst_sale_channel"),
         // 角色
         ROLE("dkic_b","t_mst_role")
         ;

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

@@ -42,6 +42,8 @@ public enum ErrorCodeEnum {
     NO_WAIT_INTO(4008, "非待入库单据不能删除"),
     ITEMQTY_NO_LESS_INTOQTY(4009, "商品数量不能小于入库中数量"),
     ITEMQTY_NO_LESS_OUTQTY(4010, "商品数量不能小于出库中数量"),
+    OUTINGQTY_NO_LESS_OUTQTY(4011, "入库中数量不能小于入库数量"),
+    INTOINGQTY_NO_LESS_INTOQTY(4012, "入库中数量不能小于入库数量"),
     PURCHASE_RETURN_DETAIL_NOT_EXIST(11080,"采购退货明细不可为空，请重新操作"),
     ;