修复因excel导入导致数据错误的bug

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -28,7 +28,9 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
+import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
+import org.jeecg.modules.documents.shippingDetails.service.ISyShippingDetailsItemService;
 import org.jeecg.modules.openApi.entity.DxpDataPlan;
 import org.jeecg.modules.openApi.service.IDxpDataPlanService;
 import org.jeecg.modules.spapl.entity.SizeTable;
@@ -377,8 +379,11 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             SyPreAssembledPackingList syPreAssembledPackingList =   syPreAssembledPackingListService.getById(id);
             if(code.equals("S")){
                 syPreAssembledPackingList.setPushStatus("1");
+                result.setMessage("推送成功");
+                result.setSuccess(true);
             }else{
                 syPreAssembledPackingList.setPushStatus("2");
+                result.setSuccess(false);
             }
             syPreAssembledPackingListService.updateById(syPreAssembledPackingList);
 
@@ -521,9 +526,12 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             if(code.equals("S")){
                 wrapper.set("push_Status","1");//推送过去
                 wrapper.in(" id",ids);
+                result.setMessage("推送成功");
+                result.setSuccess(true);
             }else{
                 wrapper.set("push_Status","2");//推送失败
                 wrapper.in(" id",ids);
+                result.setSuccess(false);
             }
             syPreAssembledPackingListService.update(wrapper);
 
@@ -1567,10 +1575,12 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         return syPreAssembledPackingListService.test(mains);
     }
 
-
-    public String updateAllExcelData(){
-
-        return "";
+    @AutoLog(value = "获取excel导入的数据")
+    @ApiOperation(value="获取excel导入的数据", notes="获取excel导入的数据")
+    @RequestMapping(value = "/getExcelId", method = {RequestMethod.POST})
+    public Result getExcelId(){
+        String[] ids=syPreAssembledPackingListService.getExcelId();
+        return Result.ok(ids);
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/SyPreAssembledPackingListMapper.java

@@ -33,4 +33,5 @@ public interface SyPreAssembledPackingListMapper extends BaseMapper<SyPreAssembl
    //发运明细分页列表查询
    public IPage<SyShippingDetailsVo> queryShippingDetails(IPage<SyShippingDetailsVo> page, @Param("ew") QueryWrapper<SyShippingDetailsVo> queryWrapper);
 
+   public String[] getExcelId();
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -221,7 +221,7 @@
     ${ew.customSqlSegment}
     </select>
 
-    <select id="getExcelId"  >
+    <select id="getExcelId" resultType="java.lang.String"  >
         SELECT  DISTINCT sy_pre_assembled_packing_list_id FROM
         sy_pre_assembled_packing_list_item a LEFT JOIN
         sy_shipping_details_item b
@@ -229,4 +229,5 @@
         WHERE a.size!=b.size
     </select>
 
+
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/ISyPreAssembledPackingListService.java

@@ -109,4 +109,6 @@ public interface ISyPreAssembledPackingListService extends IService<SyPreAssembl
 	public boolean add(List<SyPreAssembledPackingList> items);
 
 	public String test(List<SyPreAssembledPackingList> items);
+
+	public String[] getExcelId();
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -664,4 +664,27 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		System.out.println("strs\n"+strs);
 		return strs;
 	}
+
+	@Override
+	public String[] getExcelId() {
+		String [] ids=syPreAssembledPackingListMapper.getExcelId();
+		System.out.println("总共有"+ids.length+"条数据");
+		for (String id : ids){
+			QueryWrapper queryWrapper=new QueryWrapper();
+			queryWrapper.eq("sy_Pre_Assembled_Packing_List_Id",id);
+			List<SyPreAssembledPackingListItem> items= syPreAssembledPackingListItemMapper.selectList(queryWrapper);
+			for (SyPreAssembledPackingListItem item : items){
+				SyShippingDetailsItem shippingDetailsItem=syShippingDetailsItemMapper.selectById(item.getSyDeclarationElementsItemId());
+				queryWrapper=new QueryWrapper();
+				queryWrapper.eq("size",item.getSize());
+				queryWrapper.eq("group_Id",shippingDetailsItem.getGroupId());
+				SyShippingDetailsItem shippingDetailsItem2=syShippingDetailsItemMapper.selectOne(queryWrapper);
+				item.setOmpoIdItem(shippingDetailsItem2.getOmpoIdItem());
+				item.setSyOrderDataItemId(shippingDetailsItem2.getSyOrderDataItemId());
+				item.setSyDeclarationElementsItemId(shippingDetailsItem2.getId());
+				syPreAssembledPackingListItemMapper.updateById(item);
+			}
+		}
+		return ids;
+	}
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -1383,4 +1383,12 @@ public class SyPackingListTailoringController {
 		 return  result;
 	 }
 
+	 @AutoLog(value = "获取excel导入的数据")
+	 @ApiOperation(value="获取excel导入的数据", notes="获取excel导入的数据")
+	 @RequestMapping(value = "/getExcelId", method = {RequestMethod.POST})
+	 public Result getExcelId(){
+		 String[] ids=syPackingListTailoringService.getExcelId();
+		 return Result.ok(ids);
+	 }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/SyPackingListTailoringMapper.java

@@ -51,4 +51,6 @@ public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTa
     public List<Map<String,Object>> getDispatchLists(String id);
 
     public List<Map<String,Object>> getRdrecord32(String id);
+
+    String[] getExcelId();
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -177,4 +177,13 @@
     <select id="getRdrecord32" parameterType="java.lang.String" resultType="java.util.HashMap">
         select cinvcode,iQuantity,autoid,cFree2 from rdrecords32  where ID = (select ID  from rdrecord32  where ccode=#{value})
     </select>
+
+    <select id="getExcelId" resultType="java.lang.String"  >
+        SELECT  DISTINCT a.sy_pre_assembled_packing_list_id
+        FROM
+        sy_pre_assembled_packing_list_item a LEFT JOIN
+        sy_packing_list_tailoring_item b
+        ON a.id=b.sy_pre_assembled_packing_list_item_id
+        WHERE a.ompo_Id_Item!=b.ompo_Id_Item
+    </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/ISyPackingListTailoringService.java

@@ -93,4 +93,6 @@ public interface ISyPackingListTailoringService extends IService<SyPackingListTa
 	String three(SyPackingListTailoring main, Map<String, Object> map);
 
     String getOrderDataId(String id);
+
+    String[] getExcelId();
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -10,6 +10,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.InterfaceConnUtils;
+import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem;
 import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderItemMapper;
 import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderMapper;
@@ -19,6 +20,7 @@ import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem;
 import org.jeecg.modules.spapl.mapper.SyPreAssembledPackingListItemMapper;
 import org.jeecg.modules.spapl.mapper.SyPreAssembledPackingListMapper;
+import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
 import org.jeecg.modules.splt.entity.SyPackingListTailoring;
 import org.jeecg.modules.splt.entity.SyPackingListTailoringItem;
 import org.jeecg.modules.splt.mapper.SyPackingListTailoringItemMapper;
@@ -682,6 +684,24 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		return syPackingListTailoringMapper.getOrderDataId(id);
 	}
 
+	@Override
+	public String[] getExcelId() {
+		String [] ids=syPackingListTailoringMapper.getExcelId();
+		System.out.println("总共有"+ids.length+"条数据");
+		for (String id : ids){
+			QueryWrapper queryWrapper=new QueryWrapper();
+			queryWrapper.eq("sy_pre_assembled_packing_list_id",id);
+			List<SyPackingListTailoringItem> items= syPackingListTailoringItemMapper.selectList(queryWrapper);
+			for (SyPackingListTailoringItem item : items){
+				SyPreAssembledPackingListItem preAssembledPackingListItem=syPreAssembledPackingListItemMapper.selectById(item.getSyPreAssembledPackingListItemId());
+				item.setOmpoIdItem(preAssembledPackingListItem.getOmpoIdItem());
+				item.setSyOrderDataItemId(preAssembledPackingListItem.getSyOrderDataItemId());
+				syPackingListTailoringItemMapper.updateById(item);
+			}
+		}
+		return ids;
+	}
+
 	String saveBatch(SyPackingListTailoring main,Map<String,Object> mapt){
 		mapt.put("customerCode","xxx");//进入方法时设置客户编码为空
 		if(main==null){