errorCode更新

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java

@@ -12,7 +12,7 @@ public interface ErrorCodeConstants {
     ErrorCode ITEMBASIC_NOT_EXISTS = new ErrorCode(1_000_020_000, "物品基本信息不存在");
     ErrorCode ITEMBASIC_CODE_NOT_EXISTS = new ErrorCode(1_000_020_001, "物品基本信息不正确");
     ErrorCode ITEMBASIC_CODE_EXISTS = new ErrorCode(1_000_020_002, "code已存在");
-    ErrorCode ITEMBASIC_STATUS_NOT_EXISTS = new ErrorCode(1_000_020_003, "状态不存在");
+    ErrorCode ITEMBASIC_STATUS_NOT_EXISTS = new ErrorCode(1_000_020_003, "状态不存在{}");
     ErrorCode ITEMBASIC_UOM_NOT_EXISTS = new ErrorCode(1_000_020_004, "计量单位不存在");
     ErrorCode ITEMBASIC_IS_STDPACK_NOT_EXISTS = new ErrorCode(1_000_020_005, "是否标包不存在");
     ErrorCode ITEMBASIC_ENABLE_BUY_NOT_EXISTS = new ErrorCode(1_000_020_006, "可采购不存在");
@@ -25,6 +25,7 @@ public interface ErrorCodeConstants {
     ErrorCode ITEMBASIC_VALIDITY_DAYS_NOT_EXISTS = new ErrorCode(1_000_020_013, "有效天数不存在{}");
     ErrorCode ITEMBASIC_AVAIABLE_NOT_EXISTS = new ErrorCode(1_000_020_014, "是否可用不存在");
     ErrorCode ITEMBASIC_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_020_015, "导入物品基础信息不能为空");
+    ErrorCode ITEMBASIC_EXCEPTION = new ErrorCode(1_000_020_016, "物品基础信息错误:【{}】");
     //物品包装信息ErrorCode
     ErrorCode ITEMPACKAGING_NOT_EXISTS = new ErrorCode(1_000_021_000, "物品包装信息 不存在");
     ErrorCode ITEMPACKAGING_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_021_001, "code不存在");
@@ -366,13 +367,11 @@ public interface ErrorCodeConstants {
     ErrorCode PARAMSETTING_VALUE_SCOPE_NOT_EXISTS = new ErrorCode(1_000_062_007, "值范围不存在");
     //采购订单主ErrorCode
     ErrorCode PURCHASE_MAIN_NOT_EXISTS = new ErrorCode(1_000_063_000, "采购订单主不存在");
-    //采购订单ErrorCode
     ErrorCode PURCHASE_CLOSED_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单已关闭");
     //采购订单子ErrorCode
     ErrorCode PURCHASE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单子不存在");
     ErrorCode PURCHASE_DETAIL_ARGUMENT_NOT_EXISTS = new ErrorCode(1_000_063_002, "采购订单明细：订单号ppo_number、订单行pline_number、零件号pitem_code无效");
-    ErrorCode PURCHASE_DETAIL_NUMBER_NOT_EXISTS = new ErrorCode(1_000_063_003, "采购订单pnumber无效");
-    //采购订单ErrorCode
+    ErrorCode PURCHASE_DETAIL_NUMBER_NOT_EXISTS = new ErrorCode(1_000_063_003, "采购订单【{}】无效");
     //采购索赔申请主ErrorCode
     ErrorCode PURCHASECLAIM_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_064_000, "采购索赔申请主不存在");
     //采购索赔申请主ErrorCode
@@ -805,5 +804,9 @@ public interface ErrorCodeConstants {
     ErrorCode SWITCH_NOT_EXISTS = new ErrorCode(1_000_166_000, "单据开关不存在");
     //企业ErrorCode
     ErrorCode ENTERPRISE_NOT_EXISTS = new ErrorCode(1_000_167_000, "企业不存在");
+    //"订单行"+ poLine + "的已发货数量" + shippedQty + "+计划数量" + qty + "大于订单数量" + orderQty     ErrorCode
+    ErrorCode AMOUNT_EXCEPTION = new ErrorCode(1_000_400_000, "数量问题:【{}】");
+    //UOM   ErrorCode
+    ErrorCode UOM_EXCEPTION = new ErrorCode(1_000_401_000, "单位问题:【{}】");
 }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java

@@ -213,14 +213,10 @@ public class JobUtils {
     //到库位与任务库位是否一致（可配置）
     public boolean jobToLocationCodeAndRecordToLocationCodeAccord(String jobToLocationCode, String recordToLocationCode, String allowModifyLocation) {
         if (jobToLocationCode != null || !"".equals(jobToLocationCode)) {
-            if (!jobToLocationCode.equals(recordToLocationCode)) {
-                if ("TRUE".equals(allowModifyLocation)) {
-                    return true;
-                } else {
-                    throw exception(LOCATION_HANDLE_TOLOCATIONCODE_AND_RECOMMEND_TOLOCATIONCODECODE_INCONFORMITY);
-                }
-            } else {
+            if (!jobToLocationCode.equals(recordToLocationCode) && "TRUE".equals(allowModifyLocation)) {
                 return true;
+            } else {
+                throw exception(LOCATION_HANDLE_TOLOCATIONCODE_AND_RECOMMEND_TOLOCATIONCODECODE_INCONFORMITY);
             }
         } else {
             return true;
@@ -290,7 +286,7 @@ public class JobUtils {
         if (ifInType) {
             return true;
         } else {
-            throw new UtilException("物料类型" + pitemCode + "的类型" + itembasicDO.getType() + " 与业务类型" + businesstypeDO.getName()
+            throw exception(ITEMBASIC_EXCEPTION,"物料类型" + pitemCode + "的类型" + itembasicDO.getType() + " 与业务类型" + businesstypeDO.getName()
                     + "的物料类型"  + businesstypeDO.getItemTypes() +"不一致");
 
         }
@@ -308,7 +304,7 @@ public class JobUtils {
         if (ifInType) {
             return true;
         } else {
-            throw exception(1_000_020_000,"物料类型" + pitemType + " 与业务类型" + businesstypeDO.getName() + "的物料类型"  + businesstypeDO.getItemTypes() +"不一致");
+            throw exception(ITEMBASIC_EXCEPTION,"物料类型" + pitemType + " 与业务类型" + businesstypeDO.getName() + "的物料类型"  + businesstypeDO.getItemTypes() +"不一致");
         }
     }
     //DBT---DBT2---IS   物料状态检验是否一致
@@ -709,14 +705,10 @@ public class JobUtils {
      */
     public BusinesstypeDO selectDocumentSettingFromBusinessType(String pcode){
         DocumentsettingDO documentsettingDO = documentsettingService.selectDocumentsettingExist(pcode);
-        if(documentsettingDO != null){
-            if(documentsettingDO.getBusinessType() != null){
-                BusinesstypeDO businesstypeDO = businesstypeService.selectBusinesstypeExist(documentsettingDO.getBusinessType());
-                if(businesstypeDO != null){
-                    return businesstypeDO;
-                }else {
-                    return null;
-                }
+        if(documentsettingDO != null && documentsettingDO.getBusinessType() != null){
+            BusinesstypeDO businesstypeDO = businesstypeService.selectBusinesstypeExist(documentsettingDO.getBusinessType());
+            if(businesstypeDO != null){
+                return businesstypeDO;
             }else {
                 return null;
             }