推送u8调整

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

@@ -118,8 +118,7 @@
 	<select id="selectByMainId2" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
 		SELECT a.create_time ,a.create_by ,a.garment_Factory,(Select declaration_Name
 		from sy_declaration_elements
-		where id= (select elements_Id from sy_shipping_details_item
-		where id=b.sy_shipping_details_item_id)
+		where id=elements_Id
 		) declaration_Name,b.* FROM
 		sy_packing_list_fabric a LEFT JOIN
 		sy_packing_list_fabric_item b ON

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

@@ -1074,7 +1074,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().indexOf("040")>-1&&mapt.get("account").equals("903")){//903账套中物料分类为040的印花面料
 						List<Map<String,Object>> orderDataItem3 =syPackingListFabricMapper.getOM_MOMaterials(item.getOmpoIdItem(),item.getInventoryCode());//委外订单子表
 						Map<String,Object> mapStr1=syPackingListFabricMapper.getOM_MOMain(item.getOmpoIdItem(),item.getInventoryCode());//供应商编码，存货编码
-						System.out.println("mapStr1\n"+mapStr1);
+						//System.out.println("mapStr1\n"+mapStr1);
 						if(mapStr1==null) {
 							throw new JeecgBootException(mapt.get("account")+"账套,委外订单子表行id"+item.getOmpoIdItem()+"未找到对应的染厂物料");
 						}else if(!mapStr1.containsKey("isosid")||mapStr1.get("isosid")==null){
@@ -1097,7 +1097,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						for (Map<String,Object> stringObjectMap : orderDataItem3){
 							JSONObject mapItem2=new JSONObject();
 							getcFree(mapItem2,stringObjectMap);
-							mapItem2.put("ALLCAUTOIDCOL","MOMaterialsID");//订单明细ID对应字段名(固定MOMaterialsID) MOMaterialsID
+							mapItem2.put("ALLCAUTOIDCOL","AllocateId");//订单明细ID对应字段名(固定MOMaterialsID) MOMaterialsID
 							mapItem2.put("AUTOID_ALL",stringObjectMap.get("MOMaterialsID"));//关联明细ID
 							mapItem2.put("CINVCODE",stringObjectMap.get("cInvCode"));//存货编码（如果来源单据是委外订单，此字段需要传该订单的子件编码）
 							mapItem2.put("IQUANTITY",stringObjectMap.get("iQuantity"));//数量
@@ -1548,7 +1548,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	 * @return
 	 */
 	//@Override
-	//@Scheduled(fixedRate=1000*60*3)
+	@Scheduled(fixedRate=1000*60*3)
 	//@Transactional
 	public String getU8Data (){
 		String massage="";
@@ -1855,6 +1855,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 	@Override
 	public void execute(JobExecutionContext context) throws JobExecutionException {
-		this.getU8Data();//定时任务直接调用本地方法
+		//this.getU8Data();//定时任务直接调用本地方法
 	}
 }

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

@@ -1278,6 +1278,7 @@ public class SyPackingListTailoringController {
 			if(syPackingListTailoringItems!=null){
 				main.setSyPackingListTailoringItemList(syPackingListTailoringItems);
 				map.put("account",main.getSyPackingListTailoringItemList().get(0).getOmpoAccount());//委外采购账套号
+				map.put("account1",main.getSyPackingListTailoringItemList().get(0).getOmpoAccount());//委外采购账套号
 				map.put("ompoId",main.getSyPackingListTailoringItemList().get(0).getOmpoId());//采购委外主表id
 				if(main.getPurchase()==null){
 					map.put("mpOrder",main.getSyPackingListTailoringItemList().get(0).getSpurOrSubOrder());//采购委外订单号
@@ -1476,7 +1477,7 @@ public class SyPackingListTailoringController {
 	 @ApiOperation(value="调试接口-材料出库单", notes="调试接口-材料出库单")
 	 @RequestMapping(value = "/pushJson6", method = {RequestMethod.POST})
 	 public Result json6(@RequestBody JSONArray jsonArray){
-		 JSONArray jsonArray2= InterfaceConnUtils.doPost(jsonArray,"purchasein_import");
+		 JSONArray jsonArray2= InterfaceConnUtils.doPost(jsonArray,"materialout_import");
 		 Result result=new Result();
 		 result.setResult(jsonArray2);
 		 return  result;

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

@@ -859,16 +859,25 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				map5.put("CGLTYPE","委外订单");//来源单据类型
 				map6.put("CGLTYPE","销售出库单");//来源单据类型
 			}else {//查询采购订单表数据
-				if(mapt.get("orderNumber").equals("one")){
-					orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("mpOrder")+"'","POID");//委外订单号判断
+				if(mapt.get("account1").equals("901")){
+					orderData=syPackingListTailoringMapper.getOmOrPo("om_momain","cCode='"+mapt.get("mpOrder")+"'","moid");
+					map.put("CRDCODE","12");//入库类别（采购入库/委外入库）
+					map.put("CGLTYPE","委外订单");//来源单据类型
+					map4.put("CGLTYPE","销售发货单");//来源单据类型
+					map5.put("CGLTYPE","委外订单");//来源单据类型
+					map6.put("CGLTYPE","销售出库单");//来源单据类型
 				}else{
-					orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("orderNumber")+"'","POID");//根据采购订单号判断
+					if(mapt.get("orderNumber").equals("one")){
+						orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("mpOrder")+"'","POID");//委外订单号判断
+					}else{
+						orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("orderNumber")+"'","POID");//根据采购订单号判断
+					}
+					map.put("CRDCODE","11");//入库类别（采购入库/委外入库）
+					map.put("CGLTYPE","采购订单");//来源单据类型
+					map4.put("CGLTYPE","销售发货单");//来源单据类型
+					map5.put("CGLTYPE","采购订单");//来源单据类型
+					map6.put("CGLTYPE","销售出库单");//来源单据类型
 				}
-				map.put("CRDCODE","11");//入库类别（采购入库/委外入库）
-				map.put("CGLTYPE","采购订单");//来源单据类型
-				map4.put("CGLTYPE","销售发货单");//来源单据类型
-				map5.put("CGLTYPE","采购订单");//来源单据类型
-				map6.put("CGLTYPE","销售出库单");//来源单据类型
 			}
 			if(orderData!=null){
 				map.put("CVENCODE",orderData.get("cvencode"));//供应商编码
@@ -896,7 +905,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 
 				Map<String,Object> orderDataItem=null;// inum
-				if(!mapt.get("account").equals("903")){ //采购订单子表数据  顺序---2
+				if(!mapt.get("account").equals("903")&&!mapt.get("account1").equals("901")){ //采购订单子表数据  顺序---2
 					/*System.out.println("mapt.get(\"orderNumber\")\n"+mapt.get("orderNumber"));
 					System.out.println("mapt.containsKey(\"itemSort\")\t"+mapt.containsKey("itemSort"));
 					System.out.println("item.getOmpoIdItem()\t"+item.getOmpoIdItem());*/