fix：修复因表格出现空行导入异常

fix：修复批量预算导入审批显示异常

src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java

@@ -260,7 +260,8 @@ public class GoodsSkuController {
         final String DELETE = "3";
         final String SAVE = "1";
         boolean throwEx = false;
-        Map<String,List<GoodsSkuImportBo.SkuItem>> skuItemList = param.getSkuList().stream().collect(Collectors.groupingBy(GoodsSkuImportBo.SkuItem::getOpt));
+        Map<String,List<GoodsSkuImportBo.SkuItem>> skuItemList = param.getSkuList().stream()
+                .filter(a->a.getOpt()!=null).collect(Collectors.groupingBy(GoodsSkuImportBo.SkuItem::getOpt));
         //处理删除
         List<GoodsSkuImportBo.SkuItem> delList = skuItemList.get(DELETE);
         if(delList!=null){
@@ -315,6 +316,9 @@ public class GoodsSkuController {
         List<GoodsSpu> spuList = goodsSpuService.getByCodes(spuCodes);
         for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) {
             String opt = skuItem.getOpt();
+            if(opt==null){
+                continue;
+            }
             if(opt.equals(DELETE)){
                 continue;
             }
@@ -392,6 +396,8 @@ public class GoodsSkuController {
         udpSku.setTasteVal(skuItem.getTasteVal());
         udpSku.setSpecInfos(skuItem.getBelong()+";"+skuItem.getTasteVal()+";"+skuItem.getWrapVal());
         udpSku.setRemark(skuItem.getRemark());
+        udpSku.setEnable(skuItem.getEnable());
+        udpSku.setInvUnitWeight(skuItem.getInvUnitWeight());
         return udpSku;
     }
 

src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuImportBo.java

@@ -77,6 +77,12 @@ public class GoodsSkuImportBo {
         /** 备注 */
         private String remark;
 
+        /** 是否开启 1、是；0否 */
+        private Integer enable;
+
+        /** 净重 */
+        private BigDecimal invUnitWeight;
+
         private String errMsg;
     }
 

src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java

@@ -195,9 +195,7 @@ public class TbsBudgetChange implements Serializable {
 
 	public static TbsBudgetChange toNewObject(TbsBudget source){
 		TbsBudgetChange budgetChange = new TbsBudgetChange();
-		//budgetChange.setId(source.getId());
 		budgetChange.setBudgetId(source.getId());
-		//budgetChange.setChangeCode(source.getChangeCode());
 		budgetChange.setBudgetTitle(source.getBudgetCode());
 		budgetChange.setBudgetNumber(source.getBudgetNumber());
 		budgetChange.setBudgetCheckState(source.getBudgetCheckState());
@@ -211,14 +209,7 @@ public class TbsBudgetChange implements Serializable {
 		budgetChange.setScheduleId(source.getScheduleId());
 		budgetChange.setScheduleCode(source.getScheduleCode());
 		budgetChange.setScheduleName(source.getScheduleName());
-		budgetChange.setSubmitTime(source.getSubmitTime());
 		budgetChange.setRemark(source.getRemark());
-//		budgetChange.setCreateTime(source.getCreateTime());
-//		budgetChange.setUpdateTime(source.getUpdateTime());
-//		budgetChange.setTenantId(source.getTenantId());
-//		budgetChange.setCreateBy(source.getCreateBy());
-//		budgetChange.setUpdateBy(source.getUpdateBy());
-//		budgetChange.setDelFlag(source.getDelFlag());
 		return budgetChange;
 	}
 

src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChangeScheduleItem.java

@@ -81,6 +81,15 @@ public class TbsBudgetChangeScheduleItem implements Serializable {
     /** 新的预估发货金额 */
     private BigDecimal newPreDispatchAmount;
 
+    /** 品牌名称 */
+    private String brandNames;
+
+    /** 类目名称 */
+    private String categoryNames;
+
+    /** 系列名称 */
+    private String seriesNames;
+
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java

@@ -413,6 +413,10 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
                         resultItem.setBudgetAmount(realAmt);
                         resultItem.setNewBudgetAmount(budgetAmount.getBudgetAmount());
                         resultItem.setNewPreDispatchAmount(budgetAmount.getPreDispatchAmount());
+                        resultItem.setCategoryNames(paramItem.getCategoryNames());
+                        resultItem.setBrandNames(paramItem.getBrandNames());
+                        resultItem.setSeriesNames(paramItem.getSeriesNames());
+                        resultItem.setRemark(paramItem.getRemark());
                         changeScheduleItemList.add(resultItem);
                     }
                 }