推送调整

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

@@ -1122,7 +1122,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		return pages;
 	}
 
-
 	@Autowired
 	private SyShippingOrderMapper syShippingOrderMapper;//托书主表
 
@@ -1152,7 +1151,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 			String createBy="进出口平台管理员";
 			//String createDate=main.getCreateTime().toString();
-			String createDate=main.getTheFinalShippingDate();//转化日期类型
+			String createDate=main.getTheFinalShippingDate().substring(0,10);//转化日期类型
 			JSONObject map=new JSONObject();//采购(委外)入库单
 			map.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime")));//获取单据号
 			//map.put("CVOUCHCODE", main.getId());//获取单据号
@@ -1206,20 +1205,20 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map7.put("cVouchType",1);//传1
 			map7.put("CRDCODE","12");//入库类别
 			map7.put("CGLTYPE","委外订单");//来源单据类型
-			map7.put("CMAKER",createBy);//制单人
+			//map7.put("CMAKER",createBy);//制单人
 			map7.put("CHANDLER",createBy);//审核人
 
 
 			map.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
 			map.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
-			map2.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
-			map3.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
-			map4.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
+			//map2.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
+			//map3.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
+			//map4.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
 			map5.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
 			map5.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
 			map6.put("CDEFINE11",main.getEndCustomer());//最终客户
 			map6.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
-			map7.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
+			//map7.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
 			map6.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
 
 			if(main.getShippingOrderNumber()!=null){

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

@@ -1083,12 +1083,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			Map<String,String> mapSort=new HashMap<>();
 			String createBy="进出口平台管理员";
 			//String createDate=main.getCreateTime().toString();
-			String createDate=main.getTheFinalShippingDate();//转化日期类型
+			String createDate=main.getTheFinalShippingDate().substring(0,10);//转化日期类型
 			JSONObject map=new JSONObject();//采购(委外)入库单
 			map.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime")));//获取单据号
 			//map.put("CVOUCHCODE", main.getId());//获取单据号
 			map.put("DDATE",createDate);//日期(格式2015-01-01)
-			map.put("CMEMO",main.getMemo());//制单人
+			map.put("CMEMO",main.getMemo());//备注
 			map.put("CMAKER",createBy);//制单人
 			map.put("CHANDLER",createBy);//审核人
 			map.put("cVouchType",1);//传1
@@ -1125,8 +1125,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
 			map.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
 			//map2.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
-			map3.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
-			map4.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
+			//map3.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
+			//map4.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
 			map5.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
 			map5.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
 			map6.put("CDEFINE11",main.getEndCustomer());//最终客户