Merge remote-tracking branch 'origin/master'

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

@@ -100,6 +100,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				item1.setOrderNumber(syItem.getOrderNumber());//获取订单号
 				item1.setSpurOrSubOrder(syItem.getPurOrSubOrder());//获取采购委外订货号
 				item1.setSyOrderDataItemId(syItem.getSyOrderDataItemId());//获取到订单子表id
+				item1.setSyOrderDataId(syItem.getSyOrderDataId());//获取到订单子表id
 				item1.setSalesman(syItem.getSalesman());//获取业务员
 				item1.setSalesDepartment(syItem.getSalesDepartment());//获取销售部门
 				item1.setInventoryCode(syItem.getInventoryCcode());
@@ -203,6 +204,13 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		if(oConvertUtils.isEmpty(syPreAssembledPackingList.getStatus())||!syPreAssembledPackingList.getStatus().equals("1")){
 			syPreAssembledPackingList.setStatus("0");//单据状态默认为0
 		}
+		if(syPreAssembledPackingList.getSyOrderDataId()==null){
+			SyShippingDetails syShippingDetails=syShippingDetailsMapper.selectById(syPreAssembledPackingList.getSyDeclarationElementsId());
+			if(syShippingDetails!=null&&syShippingDetails.getSyOrderDataId()!=null){
+				syPreAssembledPackingList.setSyOrderDataId(syShippingDetails.getSyOrderDataId());
+			}
+		}
+
 		syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//往主表添加数据
 		if(syPreAssembledPackingList.getSyPreAssembledPackingListItemList()!=null){
 			BigDecimal box=add(syPreAssembledPackingList.getSyPreAssembledPackingListItemList(),syPreAssembledPackingList.getId());

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

@@ -100,8 +100,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				syPreItem.setExcessQuantity(syPreItem.getRemainingQuantity().subtract(item1.getTotal()).negate());
 				item1.setSalesman(syPreItem.getSalesman());//获取业务员
 				item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取业务部门
+				item1.setSyOrderDataId(syPreItem.getSyOrderDataId());//订单数据主表id
+				item1.setSyOrderDataItemId(syPreItem.getSyOrderDataItemId());//订单数据子表id
 				item1.setOrderNumber(syPreItem.getOrderNumber());//销售订单号
 				item1.setSpurOrSubOrder(syPreItem.getSpurOrSubOrder());//获取采购委外订单号
+				item1.setOmpoId(syPreItem.getOmpoId());//获取采购委外主表id
+				item1.setOmpoIdItem(syPreItem.getOmpoIdItem());//获取采购委外子表id
 				syPreAssembledPackingListItemMapper.updateById(syPreItem);//修改剩余数量
 				syPackingListTailoringItemMapper.insert(item1);//添加子表数据
 			}
@@ -178,6 +182,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		updateWrapper.set("is_Reference","2");//已被预装箱单参照,装箱单不能取消提交
 		updateWrapper.eq("id",syPackingListTailoring.getSyPreAssembledPackingListId());//预装箱单主表id做为修改条件
 		syPreAssembledPackingListMapper.update(null,updateWrapper);//修改
+		SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListMapper.selectById(syPackingListTailoring.getSyPreAssembledPackingListId());//获取订单数据id
+		if(syPreAssembledPackingList!=null&&syPreAssembledPackingList.getSyOrderDataId()!=null){
+			syPackingListTailoring.setSyOrderDataId(syPackingListTailoring.getSyOrderDataId());
+		}
 		if(syPackingListTailoring.getSyPackingListTailoringItemList()!=null){
 			BigDecimal box=add(syPackingListTailoring.getSyPackingListTailoringItemList(),syPackingListTailoring.getId(),syPackingListTailoring.getElementsId());
 			syPackingListTailoring.setTotalBoxes(box);
@@ -761,7 +769,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				}
 
 				Map<String,Object> orderDataItem=null;
-				if(map.get("CRDCODE").equals("采购入库")){
+				if(map.containsKey("CRDCODE")&&map.get("CRDCODE").equals("采购入库")){
 					orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "ID='"+item.getOmpoIdItem()+"'");
 					mapItem5.put("POAUTOIDCOL","ID");//明细ID对应字段名(关联单据类型为采购订单传ID，委外订单传MODetailsID，入库单为Autoid)
 					mapItem5.put("AUTOID_PO",item.getOmpoIdItem());//明细ID（采购订单行ID/委外订单行ID）
@@ -839,14 +847,14 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		System.out.println("mapList5\n"+mapList5);
 		System.out.println("mapList6\n"+mapList6);*/
 
-		JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
+	//	JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
 		/*JSONArray resturn2 = InterfaceConnUtils.doPost(mapList,"materialout_import");//材料出库单
 		JSONArray resturn3 = InterfaceConnUtils.doPost(mapList,"consignment_import");//销售发货单
 		JSONArray resturn4 = InterfaceConnUtils.doPost(mapList,"saleout_import");//销售出库单
 		JSONArray resturn5 = InterfaceConnUtils.doPost(mapList,"purinvoice_import");//采购发票单
 		JSONArray resturn6 = InterfaceConnUtils.doPost(mapList,"saleinvoice_import");//销售发票单*/
 
-		System.out.println("调用接口后返回的信息resturn1\n"+resturn1);
+	//	System.out.println("调用接口后返回的信息resturn1\n"+resturn1);
 		/*System.out.println("resturn1\n"+resturn2);
 		System.out.println("resturn1\n"+resturn3);
 		System.out.println("resturn1\n"+resturn4);