添加物品单位和基础单位副单位不一致的判断

src/main/java/com/jsh/erp/constants/ExceptionConstants.java

@@ -278,6 +278,9 @@ public class ExceptionConstants {
     //商品库存不足
     public static final int MATERIAL_STOCK_NOT_ENOUGH_CODE = 8000004;
     public static final String MATERIAL_STOCK_NOT_ENOUGH_MSG = "商品:%s库存不足";
+    //商品单位不正确
+    public static final int MATERIAL_UNIT_NOT_RIGHT_CODE = 8000005;
+    public static final String MATERIAL_UNIT_NOT_RIGHT_MSG = "商品:%s单位不正确，使用单位:%s，基础单位：%s，副单位：%s";
     /**
      *  单据信息
      * type = 85

src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java

@@ -513,9 +513,9 @@ public class DepotItemService {
                     depotItem.setHeaderid(headerId);
                     depotItem.setMaterialid(tempInsertedJson.getLong("MaterialId"));
                     depotItem.setMunit(tempInsertedJson.getString("Unit"));
+                    Material material= materialService.getMaterial(depotItem.getMaterialid());
                     if (!StringUtil.isEmpty(tempInsertedJson.get("OperNumber").toString())) {
                         depotItem.setOpernumber(tempInsertedJson.getBigDecimal("OperNumber"));
-                        try {
                         String Unit = tempInsertedJson.get("Unit").toString();
                         BigDecimal oNumber = tempInsertedJson.getBigDecimal("OperNumber");
                         Long mId = Long.parseLong(tempInsertedJson.get("MaterialId").toString());
@@ -535,13 +535,14 @@ public class DepotItemService {
                                 depotItem.setBasicnumber(oNumber); //数量一致
                             } else if (Unit.equals(otherUnit)) { //如果等于副单位
                                 depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio)) ); //数量乘以比例
+                            }else{
+                                //不等于基础单位也不等于副单位，单位存在问题
+                                throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_UNIT_NOT_RIGHT_CODE,
+                                        String.format(ExceptionConstants.MATERIAL_UNIT_NOT_RIGHT_MSG,material==null?"":material.getName(),Unit,basicUnit,otherUnit));
                             }
                         } else {
                             depotItem.setBasicnumber(oNumber); //其他情况
                         }
-                        } catch (Exception e) {
-                            logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
-                        }
                     }
                     if (!StringUtil.isEmpty(tempInsertedJson.get("UnitPrice").toString())) {
                         depotItem.setUnitprice(tempInsertedJson.getBigDecimal("UnitPrice"));
@@ -593,7 +594,6 @@ public class DepotItemService {
                         if(depotItem==null){
                             continue;
                         }
-                        Material material= materialService.getMaterial(depotItem.getMaterialid());
                         if(material==null){
                             continue;
                         }
@@ -648,9 +648,11 @@ public class DepotItemService {
                     depotItem.setId(tempUpdatedJson.getLong("Id"));
                     depotItem.setMaterialid(tempUpdatedJson.getLong("MaterialId"));
                     depotItem.setMunit(tempUpdatedJson.getString("Unit"));
+                    if(!material.getId().equals(depotItem.getMaterialid())){
+                        material= materialService.getMaterial(depotItem.getMaterialid());
+                    }
                     if (!StringUtil.isEmpty(tempUpdatedJson.get("OperNumber").toString())) {
                         depotItem.setOpernumber(tempUpdatedJson.getBigDecimal("OperNumber"));
-                        try {
                         String Unit = tempUpdatedJson.get("Unit").toString();
                         BigDecimal oNumber = tempUpdatedJson.getBigDecimal("OperNumber");
                         Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString());
@@ -667,13 +669,14 @@ public class DepotItemService {
                                 depotItem.setBasicnumber(oNumber); //数量一致
                             } else if (Unit.equals(otherUnit)) { //如果等于副单位
                                 depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio))); //数量乘以比例
+                            }else{
+                                //不等于基础单位也不等于副单位，单位存在问题
+                                throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_UNIT_NOT_RIGHT_CODE,
+                                        String.format(ExceptionConstants.MATERIAL_UNIT_NOT_RIGHT_MSG,material==null?"":material.getName(),Unit,basicUnit,otherUnit));
                             }
                         } else {
                             depotItem.setBasicnumber(oNumber); //其他情况
                         }
-                        } catch (Exception e) {
-                            logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
-                        }
                     }
                     if (!StringUtil.isEmpty(tempUpdatedJson.get("UnitPrice").toString())) {
                         depotItem.setUnitprice(tempUpdatedJson.getBigDecimal("UnitPrice"));
@@ -715,7 +718,6 @@ public class DepotItemService {
                      * 这里需要重新获取页面传递的商品信息
                      */
                     if(!material.getId().equals(depotItem.getMaterialid())){
-                        material= materialService.getMaterial(depotItem.getMaterialid());
                         if(material==null){
                             continue;
                         }