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

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

@@ -56,7 +56,7 @@ public enum ErrorCodeEnum {
     FREEZEQTY_NO_LESS_USABLEQTY(4017, "冻结数量不能小于库存可售数量"),
     RESIDUE_NO_LESS(4018, "账户可用余额不足"),
     MAC_BALANCE_NO_LESS(4018, "资金账户余额不足"),
-    AMT_HANDLE_NO_LESS_AMT_SHOULD(4019, "核销金额超出应收金额"),
+    AMT_HANDLE_NO_LESS_AMT_SHOULD(4019, "核销金额超出剩余应收金额"),
     CURRENT_INVOICE_ISACC(4020, "当前单据已记账"),
     ACC_DATE_ISNULL(4020, "账务日期不能为空"),
     CURRENT_INVOICE_ISREVERSE(4020, "当前单据已经反记账"),
@@ -70,7 +70,7 @@ public enum ErrorCodeEnum {
     THERE_ORDER_IS_NOT_CAN_INBOUND_QUANTITY(11085, "当前单据暂无可入库数量"),
     OUTBOUND_ITEM_NOT_EXIST(11086,"出库明细不可为空，请重新操作"),
     THERE_ORDER_IS_NOT_CAN_OUTBOUND_QUANTITY(11087, "当前单据暂无可出库数量"),
-    INVENTORY_QUANTITY_EXCEEDED_OUTBOUND(11088,"已出库数量加出库中数量已超出单据可操作总数量！"),
+    INVENTORY_QUANTITY_EXCEEDED_OUTBOUND(11088,"出库数量已超出单据可出库总数量！"),
     WAREHOUSE_IS_NULL(11089,"当前数据中有空仓库数据！"),
     SKU_IS_NULL(11090,"当前数据中有空商品数据，请重新操作！"),
     NO_MESSAGE_OPERATE_INVENTORY(11091,"当前没有可操作库存数据！"),
@@ -89,6 +89,8 @@ public enum ErrorCodeEnum {
     NO_WAIT_INTO_RETURN_CANCEL(11105, "已出库单据不能作废"),
     CANNOT_EXCEED_THE_QUANTITYIN_THE_WAREHOUSE(11106, "办理数量不能超此单据入库中数量"),
     CANNOT_EXCEED_THE_QUANTITY_IN_THE_OUTBOUND_SHIPMENT(11107, "办理数量不能超此单据出入库中数量"),
+    OUTBOUND_ITEM_RETURN_QTY_ERROR(11108, "当前退货明细中存在可退数量不足商品"),
+    ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE(11109, "不能添加原单据中没有的商品进行办理"),
 
     CUSTOMER_FOLLOW_MEASURE_STATUS_DONE(8007, "当前预约量尺已填写回执"),
     ;