md

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java

@@ -2306,17 +2306,25 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         fillMap.put("sendTel", Convert.mobile(emisWaybillOld.getSendMobile()));
         fillMap.put("sendAddress", Convert.address(emisWaybillOld.getSendAddress()));
         fillMap.put("sendCompany", emisWaybillOld.getSendCompany());
+        fillMap.put("sendCountry", emisWaybillOld.getSendCountryName());
 
         fillMap.put("recvName", Convert.chineseName(emisWaybillOld.getReceiveName()));
         fillMap.put("recvTel", Convert.mobile(emisWaybillOld.getReceiveMobile()));
         fillMap.put("recvAddress", Convert.address(emisWaybillOld.getReceiveAddress()));
         fillMap.put("recvCompany", emisWaybillOld.getReceiveCompany());
+        fillMap.put("recvCountry", emisWaybillOld.getReceiveCountryName());
 
         fillMap.put("wsContact", emisWaybillOld.getIntoWarehouseContact());
         fillMap.put("wsPhone", emisWaybillOld.getIntoWarehousePhone());
         fillMap.put("wsAddress", emisWaybillOld.getIntoWarehouseAddress());
         fillMap.put("salesmen", emisWaybillOld.getSalesmen());
 
+        fillMap.put("sendProvinceName", emisWaybillOld.getSendProvinceName());
+        fillMap.put("sendCityName", emisWaybillOld.getSendCityName());
+
+        fillMap.put("recvProvinceName", emisWaybillOld.getReceiveProvinceName());
+        fillMap.put("recvCityName", emisWaybillOld.getReceiveCityName());
+
         fillMap.put("barcode", Pictures.ofBufferedImage(barcodeImageBuffer, PictureType.JPEG).size(width, height).create());
 
         fillMap.put("cargoList", emisWaybillOld.getCargoList());

emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/WordTplUtils.java

@@ -132,7 +132,7 @@ public class WordTplUtils {
 
 
 
-            XWPFTemplate template = XWPFTemplate.compile("/Users/alan/Downloads/ws_air_in_tpl.docx",config).render(
+            XWPFTemplate template = XWPFTemplate.compile("/Users/alan/Downloads/ws_kd_in_tpl.docx",config).render(
                     new HashMap<String, Object>(){{
                         put("wsInNo", "TAN-SHJD-24072701");
                         put("country", "越南");