面辅料重新拉取u8出库单

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -149,11 +149,14 @@
 		AND elements_Id IS NOT NULL
 		AND elements_Id !=''
 		and is_Pull is null
+		and del_flag=0
 		and submit_Status='1'
-    AND sy_order_data_item_id
-    NOT IN
-    (SELECT DISTINCT isosid FROM `sy_packing_list_fabric_item` WHERE isosid!=''
-     )
+		AND sy_order_data_item_id
+		NOT IN
+		(SELECT DISTINCT isosid
+		FROM `sy_packing_list_fabric_item`
+		WHERE isosid!='' and del_flag=0
+		 )
 </select>
 
 <!--

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

@@ -1577,7 +1577,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					sy.setDocumentNo(account+sy.getDocumentNo());//单据号
 					sy.setDataSource("u8拉取");//直接从u8拉取的数据
 					sy.setU8Id(account + sy.getU8Id());
-					sy.setId(sy.getU8Id());
+					//sy.setId(sy.getU8Id());
 					String sql2 = "select " +
 							"b.AutoID as u8id ,\n" +
 							"b.id as u8pid,\n" +
@@ -1638,9 +1638,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					List<SyPackingListFabricItem> items=new ArrayList<>();
 					for (JSONObject json1 : jianSon) {
 						SyPackingListFabricItem sy1 = JSONObject.toJavaObject(json1, SyPackingListFabricItem.class);
-						sy1.setU8Id(account + sy1.getU8Id());//获取账套号+id
+						sy1.setU8Id(account + sy1.getU8Id());//获取账套号+子表id
 						sy1.setSyPackingListFabricId(sy.getId());//账套号+主表id
-						sy1.setId(sy1.getU8Id());
+						//sy1.setId(sy1.getU8Id());
 						sy1.setIsosid(sy1.getAccount() + sy1.getIsosid());//账套号+销售订单id
 						sy1.setSyOrderDataId(sy1.getAccount() +sy1.getSyOrderDataId());
 						sy1.setSyOrderDataItemId(sy1.getAccount() +sy1.getSyOrderDataItemId());