瀏覽代碼

推送到u8的单据日期改成最终船期,所有单据都添加最终船期

huxy 2 年之前
父節點
當前提交
acca12ce92

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

@@ -1153,7 +1153,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 			String createBy="进出口平台管理员";
 			//String createDate=main.getCreateTime().toString();
-			String createDate=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(main.getCreateTime());//转化日期类型
+			String createDate=main.getTheFinalShippingDate();//转化日期类型
 			JSONObject map=new JSONObject();//采购(委外)入库单
 			map.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime")));//获取单据号
 			//map.put("CVOUCHCODE", main.getId());//获取单据号
@@ -1213,10 +1213,14 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 			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());//最终船期
 			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());//最终船期
 			map6.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
 
 			if(main.getShippingOrderNumber()!=null){

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

@@ -1083,7 +1083,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			Map<String,String> mapSort=new HashMap<>();
 			String createBy="进出口平台管理员";
 			//String createDate=main.getCreateTime().toString();
-			String createDate=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(main.getCreateTime());//转化日期类型
+			String createDate=main.getTheFinalShippingDate();//转化日期类型
 			JSONObject map=new JSONObject();//采购(委外)入库单
 			map.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime")));//获取单据号
 			//map.put("CVOUCHCODE", main.getId());//获取单据号
@@ -1124,6 +1124,9 @@ 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());//最终船期
 			map5.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
 			map5.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
 			map6.put("CDEFINE11",main.getEndCustomer());//最终客户