|
@@ -1153,7 +1153,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
|
|
|
String createBy="进出口平台管理员";
|
|
|
|
|
|
- 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")));
|
|
|
|
|
@@ -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){
|