huxy 1 рік тому
батько
коміт
5f2170a18b

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

@@ -2243,6 +2243,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						queryWrapper2.eq("del_flag","0");
 						queryWrapper2.orderByDesc("update_time");
 						queryWrapper2.last("limit 1");
+						System.out.println("开始查询出运明细子表");
 						SyShippingDetailsItem syShippingDetailsItem = syShippingDetailsItemMapper.selectOne(queryWrapper2);
 						if (syShippingDetailsItem != null) {
 							sy1.setIsTc(syShippingDetailsItem.getIsTc());
@@ -2585,7 +2586,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				//throw new JeecgBootException("账套"+account+"接口"+tableName+",原因"+ jsonObject.get("Description"));
 				codeMaps.put(jsonObject.get("ReceiptNo").toString(),"销售发票接口推送失败原因:"+jsonObject.get("Description").toString());//key:传入的单号,value:失败的信息
 			}else{
-				codeMaps.put(jsonObject.get("ReceiptNo").toString(),"103销售发票接口"+jsonObject.get("U8ReceiptNo").toString());//key:传入的单号,value:生成的单号
+				codeMaps.put(jsonObject.get("ReceiptNo").toString(),"103销售发票单号"+jsonObject.get("U8ReceiptNo").toString());//key:传入的单号,value:生成的单号
 			}
 		}
 		return codeMaps;//账套号-序号-生成的单号

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -280,7 +280,7 @@
 
 	<select id="sizeAlls" resultType="org.jeecg.modules.spapl.entity.SizeTable">
 		SELECT sy_packing_list_tailoring_item.size,alias,total quantity,box_Number,total/box_Number proportion,
-		sy_packing_list_tailoring_id itemId,num,group_id
+		id itemId,num,group_id
 		FROM sy_packing_list_tailoring_item
 		LEFT JOIN sizetable ON sy_packing_list_tailoring_item.`size`=sizetable.`size`
 		OR sy_packing_list_tailoring_item.`size`=sizetable.`alias`

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

@@ -102,16 +102,16 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					item1.setId(size.getItemId());//从尺码表中获取到id
 					// 获取到预装箱单子表id
 					//SyPackingListTailoringItem splt=syPackingListTailoringItemMapper.selectById(item1.getId());
-					SyPackingListTailoringItem splt=syPackingListTailoringItemMapper.selectById(item1.getId());
-					//获取预装箱单子表id
-					item1.setSyPreAssembledPackingListItemId(splt.getSyPreAssembledPackingListItemId());
 					if(size.getProportion()==0){
 						item1.setTotal(null);//该尺码件数
 					}
 					if(item.getIsAdd()>0){
+						SyPackingListTailoringItem splt=syPackingListTailoringItemMapper.selectById(item1.getId());
+						//获取预装箱单子表id
+						item1.setSyPreAssembledPackingListItemId(splt.getSyPreAssembledPackingListItemId());
 						item1.setSyPackingListTailoringId(pid);
 						item1.setId(oConvertUtils.id());//获取到随机id
-						SyPreAssembledPackingListItem syPreAssembledPackingListItem=syPreAssembledPackingListItemMapper.selectById(item1.getSyPreAssembledPackingListItemId());
+						//SyPreAssembledPackingListItem syPreAssembledPackingListItem=syPreAssembledPackingListItemMapper.selectById(item1.getSyPreAssembledPackingListItemId());
 						item1.setOmpoIdItem(item1.getOmpoIdItem());
 						syPackingListTailoringItemMapper.insert(item1);
 						continue;
@@ -2281,7 +2281,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				//throw new JeecgBootException("账套"+account+"接口"+tableName+",原因"+ jsonObject.get("Description"));
 				codeMaps.put(jsonObject.get("ReceiptNo").toString(),account+"账套"+pushName+"接口推送失败原因:"+jsonObject.get("Description").toString());//key:传入的单号,value:失败的信息
 			}else{
-				codeMaps.put(jsonObject.get("ReceiptNo").toString(),account+pushName+"接口"+jsonObject.get("U8ReceiptNo").toString());//key:传入的单号,value:生成的单号
+				codeMaps.put(jsonObject.get("ReceiptNo").toString(),account+pushName+"单号"+jsonObject.get("U8ReceiptNo").toString());//key:传入的单号,value:生成的单号
 			}
 		}
 		return codeMaps;//账套号-序号-生成的单号