面辅料推送逻辑修改，预装箱单删除时增加判断

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.hibernate.engine.jdbc.Size;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
 import org.jeecg.modules.documents.letterDeposit.mapper.SyLetterDepositItemMapper;
 import org.jeecg.modules.documents.letterDeposit.mapper.SyLetterDepositMapper;
@@ -450,6 +451,15 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	@Override
 	@Transactional
 	public Integer delMain(String id) {
+		QueryWrapper queryWrapper=new QueryWrapper();
+		queryWrapper.eq("del_flag",0);//syPreAssembledPackingListId
+		queryWrapper.eq("sy_Pre_Assembled_Packing_List_Id",id);//sy_Pre_Assembled_Packing_List_Id
+		queryWrapper.last("limit 1");
+		SyLetterDepositItem item=syLetterDepositItemMapper.selectOne(queryWrapper);
+		if (item!=null){
+			SyLetterDeposit deposit=syLetterDepositMapper.selectById(item.getSyLetterDepositId());
+			throw new JeecgBootException("该预装箱单单已被预托书号"+deposit.getDepositaryReceiptNo()+"参照");
+		}
 		long startTime = System.currentTimeMillis();
 		//List<SyPreAssembledPackingListItem> items2=syPreAssembledPackingListItemMapper.selectAll(id);
 		syPreAssembledPackingListMapper.deleteId(id);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -1383,7 +1383,6 @@ public class SyPackingListFabricController implements Job {
 		 syPackingListTailoringService.updateTimeStatus();
 	 }
 
-
 	 @AutoLog(value = "装箱单面辅料批量推送u8")
 	 @ApiOperation(value="装箱单面辅料批量推送u8", notes="装箱单面辅料批量推送u8")
 	 @GetMapping(value = "/pushBatch2")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -1570,7 +1570,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				mapItem6.put("CDEFINE31",item.getDeclarationName());//货物名称
 
 				Order orderIrowno=new Order();
-
+				if (mapt.get("customerCode").equals("one")){
+					orderDataItem.put("iSOsID",item.getSyOrderDataItemId().substring(3));
+				}
+				System.out.println("新的逻辑id\t"+orderDataItem.get("iSOsID"));
 				//if(item.getSyOrderDataItemId()!=null){//销售发货单 ---查询销售订单子表数据  顺序---5
 				if(orderDataItem!=null&&orderDataItem.containsKey("iSOsID")&&orderDataItem.get("iSOsID")!=null){
 					Map<String,Object> orderDataItem2=syPackingListTailoringMapper.getSoMainItem(orderDataItem.get("iSOsID").toString());