预装箱单导入调整

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

@@ -939,18 +939,26 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			BigDecimal total3=new BigDecimal("0");
 			BigDecimal total4=new BigDecimal("0");//(本次数量+现有数量)>1.9*发货数量就报错
 			String name="";
-			String ids="";
+			//String ids="";
+			ArrayList<String> ids=new ArrayList<>();
 			List<SyShippingDetailsItem> syShippingDetailsItems=syPreAssembledPackingListItemMapper.getWideSizes(main.getSyDeclarationElementsId());
 			for (SyPreAssembledPackingListItem item :main.getSyPreAssembledPackingListItemList()){
 				Map<String,String> map=new HashMap<>();
+				boolean bool=true;
 				for (SyShippingDetailsItem detailsItem : syShippingDetailsItems){
+					//ids+=""+detailsItem.getId()+",";//出运明细子表id
 					if (item.getGroupItemId().equals(detailsItem.getGroupId())){
+						ids.add(detailsItem.getId());
 						if(((detailsItem.getCodingRules()==null||detailsItem.getCodingRules().length()<1)&&item.getWithCode().equals("默认配码规格"))
 								||detailsItem.getCodingRules().equals(item.getWithCode())){
 							map.put(detailsItem.getSize(),detailsItem.getId());
+							bool=false;
 						}
 					}
 				}
+				if (bool){
+					throw new JeecgBootException("未找到配码规格\t"+item.getWithCode());
+				}
 				//System.out.println("size\t"+item.getSizeTables());默认配码规格
 				System.out.println("配码规格\t"+item.getWithCode());
 				total3=total3.add(item.getTotal());
@@ -961,7 +969,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 						System.out.println("sub\t"+sub);
 						total3=total3.subtract(sub);
 					}else{
-						ids+=""+map.get(size.getSize())+",";//获取出运明细子表id
+						//ids+=""+map.get(size.getSize())+",";//获取出运明细子表id
 					}
 					System.out.println("尺码\t"+size.getSize()+"\t数量\t"+size.getProportion());
 					if(num2==0){
@@ -975,10 +983,12 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					num2++;
 				}
 			}
-			if(!ids.equals("")){
-				ids=ids.substring(0,ids.length()-1);
+			System.out.println("ids.size\t"+ids.size());
+			System.out.println("ids\n"+ids);
+			if(ids.size()>0){
+				//ids=ids.substring(0,ids.length()-1);
 				QueryWrapper queryWrapper=new QueryWrapper();
-				queryWrapper.in("id", Arrays.asList(ids.split(",")));
+				queryWrapper.in("id", ids);
 				queryWrapper.select("sum(shipment_Quantity) as shipment_Quantity");
 				SyShippingDetailsItem syshippings=syShippingDetailsItemMapper.selectOne(queryWrapper);
 				if(syshippings!=null){
@@ -987,7 +997,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					//throw new JeecgBootException("该单据在上游未找到");
 				}
 				queryWrapper=new QueryWrapper();
-				queryWrapper.in("sy_declaration_elements_item_id", Arrays.asList(ids.split(",")));
+				queryWrapper.in("sy_declaration_elements_item_id",ids);
 				queryWrapper.eq("del_flag","0");
 				queryWrapper.select("sum(total) as total");
 				SyPreAssembledPackingListItem sypre=syPreAssembledPackingListItemMapper.selectOne(queryWrapper);

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

@@ -1277,6 +1277,8 @@ public class SyPackingListFabricController implements Job {
 					 }else{
 						 message2="请先维护装运期限再推送";
 					 }
+				 }else{
+					 message2="请先做托书再推送";
 				 }
 				 /*if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
 					 message2="数据在推送中，请不要重复点击";
@@ -1580,6 +1582,10 @@ public class SyPackingListFabricController implements Job {
 					 message2="请先维护装运期限再推送";
 					 //return result;
 				 }
+			 }else{
+				 result.setSuccess(false);
+				 result.setMessage("请先做托书再推送");
+				 message2="请先做托书再推送";
 			 }
 			 if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
 				 result.setSuccess(false);

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

@@ -1580,6 +1580,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						String id=item.getSyOrderDataItemId();
 						if ((id.indexOf('('))>-1){
 							id=id.substring(3,id.indexOf("(")-1);
+						}else{
+							id=id.substring(3);
 						}
 						orderDataItem2=syPackingListTailoringMapper.getSoMainItem2(id);
 						//mapItem3.put("AUTOID_SO",id);//来源单据明细ID

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

@@ -1400,6 +1400,8 @@ public class SyPackingListTailoringController implements Job {
 					 }else{
 						 message2="请先维护装运期限再推送";
 					 }
+				 }else{
+					 message2="请先做托书再推送";
 				 }
 				 List<SyPackingListTailoringItem> syPackingListTailoringItems=syPackingListTailoringService.getList(main.getId());
 				 main.setSyPackingListTailoringItemList(syPackingListTailoringItems);
@@ -1671,6 +1673,7 @@ public class SyPackingListTailoringController implements Job {
 			Map<String,Object> map=new HashMap<>();
 			Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(ids);
 			//System.out.println("madate\t"+mapdate);
+			System.out.println("madate\t"+mapdate);
 			if(mapdate!=null){
 				if(!mapdate.containsKey("e4")||mapdate.get("e4").equals("0")){
 					result.setSuccess(false);
@@ -1697,6 +1700,10 @@ public class SyPackingListTailoringController implements Job {
 					message2="请先维护装运期限再推送";
 					//return result;
 				}
+			}else{
+				result.setSuccess(false);
+				result.setMessage("请先做托书再推送");
+				message2="请先做托书再推送";
 			}
 
 			//long endTime2 = System.currentTimeMillis();

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

@@ -257,11 +257,11 @@
     </select>
 
     <select id="getOmOrPoItem" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select  iMoney,iNatUnitPrice, iTaxPrice ,iPerTaxRate ,iNatMoney,iSOsID,${id} as id,inum,iUnitPrice    from ${tableName} where  ${orderName}
+        select  iMoney,iNatUnitPrice, iTaxPrice ,iPerTaxRate ,iNatMoney,iSOsID,${id} as id,inum,iUnitPrice   from ${tableName} where  ${orderName}
     </select>
 
     <select id="getSoMain" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select cPersonCode,cDepCode,cBusType,cPayCode,cexch_name,iExchRate,cCusCode,cSOCode,cSTCode,cexch_name     from SO_SOMain WHERE id=#{id}
+        select cPersonCode,cDepCode,cBusType,cPayCode,cexch_name,iExchRate,cCusCode,cSOCode,cSTCode,cexch_name   from SO_SOMain WHERE id=#{id}
     </select>
 
     <select id="getSoMainItem" parameterType="java.lang.String" resultType="java.util.HashMap">