no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/WebsitGoodsLogic.java

@@ -590,7 +590,7 @@ public class WebsitGoodsLogic {
 
         for (int i = 0; i < objects.size(); i++) {
             List<Object> row = (List<Object>) objects.get(i);
-            CommonUtils.initList2(row, 11);
+            CommonUtils.initList2(row, 12);
             if (row.size() < 7) {
                 row.add(null);
                 row.add(null);
@@ -605,16 +605,19 @@ public class WebsitGoodsLogic {
                 throw new RemoteServiceException("第" + (i+1) + "行, 单位不能为空");
             }
             if (Objects.isNull(row.get(2))) {
-                throw new RemoteServiceException("第" + (i+1) + "行, 销售价格不能为空");
+                throw new RemoteServiceException("第" + (i+1) + "行, 市场价格不能为空");
             }
             if (Objects.isNull(row.get(3))) {
-                throw new RemoteServiceException("第" + (i+1) + "行, 收费标准不能为空");
+                throw new RemoteServiceException("第" + (i+1) + "行, 适用品牌不能为空");
             }
             if (Objects.isNull(row.get(4))) {
-                throw new RemoteServiceException("第" + (i+1) + "行, 适用品牌不能为空");
+                throw new RemoteServiceException("第" + (i+1) + "行, 适用产品大类不能为空");
             }
             if (Objects.isNull(row.get(5))) {
-                throw new RemoteServiceException("第" + (i+1) + "行, 适用产品大类不能为空");
+                throw new RemoteServiceException("第" + (i+1) + "行, 配件类型不能为空");
+            }
+            if (Objects.isNull(row.get(6))) {
+                throw new RemoteServiceException("第" + (i+1) + "行, 物料组不能为空");
             }
 //            if (Objects.isNull(row.get(6))) {
 //                throw new RemoteServiceException("第" + (i+1) + "行, 自有库存师傅分账金额不能为空");
@@ -626,11 +629,12 @@ public class WebsitGoodsLogic {
             String goodsNameStr = (String) row.get(0);
             String unitStr = (String) row.get(1);
             String salesStr = (String) row.get(2);
-            String normAmountStr = (String) row.get(3);
-            String brandStr = (String) row.get(4);
-            String categoryStr = (String) row.get(5);
+//            String normAmountStr = (String) row.get(3);
+            String brandStr = (String) row.get(3);
+            String categoryStr = (String) row.get(4);
 //            String selfAmountStr = (String) row.get(6);
-            String partType = (String) row.get(6);
+            String partType = (String) row.get(5);
+            String materialGroupName = (String) row.get(6);
             String goodsCodeStr = (String) row.get(7);
             String remark = (String) row.get(8);
 
@@ -671,7 +675,7 @@ public class WebsitGoodsLogic {
                 }
             }
 
-            BigDecimal normAmount = new BigDecimal(normAmountStr);
+//            BigDecimal normAmount = new BigDecimal(normAmountStr);
 //            BigDecimal selfAmount = new BigDecimal(selfAmountStr);
 //            BigDecimal outAmount = new BigDecimal(outAmountStr);
 //
@@ -693,8 +697,8 @@ public class WebsitGoodsLogic {
             goods.setGoodsCode(goodsCodeStr);
             goods.setRemark(remark);
             goods.setMarketPrice(new BigDecimal(salesStr));
-            goods.setNormAmount(normAmount);
-            goods.setSelfWorkerAmount(normAmount);
+//            goods.setNormAmount(normAmount);
+//            goods.setSelfWorkerAmount(normAmount);
 //            goods.setSelfWebsitAmount(normAmount.subtract(selfAmount));
 //            goods.setOutWorkerAmount(outAmount);
 //            goods.setOutWebsitAmount(normAmount.subtract(outAmount));
@@ -705,6 +709,7 @@ public class WebsitGoodsLogic {
             // 库存单位与销售单位一致
             goods.setGoodsStockUnit(StrUtil.trim(unitStr));
             goods.setGoodsSalesUnit(StrUtil.trim(unitStr));
+            goods.setMaterialGroupName(StrUtil.trim(materialGroupName));
             goods.setManageWorkerStock(JudgeEnum.YES.getKey());
             goods.setNormType(NormTypeEnum.M.getKey());
             goods.setPartType(partType);