|
@@ -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){
|