Merge remote-tracking branch 'origin/master'

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

@@ -1334,6 +1334,8 @@ public class Constant {
      * @date : 2024-03-02 17:12
      */
     public enum DisplayNoTable {
+        // 组织机构
+        ORG("dkic_b","t_mst_org"),
         // 资金账户
         MONEYACCOUNT("dkic_b","t_mst_money_account"),
         // 数据字典

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

@@ -43,16 +43,20 @@ public enum ErrorCodeEnum {
     NO_WAIT_INTO(4008, "非待入库单据不能删除"),
     ITEMQTY_NO_LESS_INTOQTY(4009, "商品数量不能小于入库中数量"),
     ITEMQTY_NO_LESS_OUTQTY(4010, "商品数量不能小于出库中数量"),
-    OUTINGQTY_NO_LESS_OUTQTY(4011, "入库中数量不能小于入库数量"),
+    OUTINGQTY_NO_LESS_OUTQTY(4011, "出库中数量不能小于出库数量"),
     INTOINGQTY_NO_LESS_INTOQTY(4012, "入库中数量不能小于入库数量"),
     OUTQTY_NO_LESS_RETURNQTY(4013, "出库数量不能小于退货数量"),
     ISEXISTS_AFTER_OPERATE(4014, "当前单据已有后续操作，不能作废"),
     ISFLGVALID_FALSE(4015, "当前单据已经作废，不能重复操作"),
+    RETURNQTY_NO_LESS_INTOINGQTY(4016, "退货数量不能小于入库中数量"),
     PURCHASE_RETURN_DETAIL_NOT_EXIST(11080,"采购退货明细不可为空，请重新操作"),
     INBOUND_ITEM_NOT_EXIST(11081,"入库明细不可为空，请重新操作"),
     ORIGINAL_DOCUMENT_ABSENT(11082,"单据所对应的原始单据不存在,不允许该操作！"),
     DATASOURCECODE_NOT(11083,"请输入数据源编码！"),
+    INVENTORY_QUANTITY_EXCEEDED(11084,"已入库数量加入库中数量已超出订单总数量！"),
     CUSTOMER_SAME_COMPANY_TELEPHONE(8001, "当前电话号码已存在"),
+
+    
     ;
 
     private int code;