md

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

@@ -4286,6 +4286,24 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             fillMap.put("wsAddress", emisWaybillOld.getIntoWarehouseAddress());
             fillMap.put("salesmen", emisWaybillOld.getSalesmen());
 
+            String salesmenPhone="";
+            if(!StringUtils.isEmpty(emisWaybillOld.getSalesmen())){
+                SysUser salesmenUser = getEmisStaffByEmpName(emisWaybillOld.getSalesmen());
+                if (salesmenUser != null) {
+                    salesmenPhone=salesmenUser.getPhonenumber();
+                }
+            }
+            fillMap.put("salesmenPhone", salesmenPhone);
+            fillMap.put("orderRemark", emisWaybillOld.getOrderRemark());
+
+            if(!StringUtils.isEmpty(emisWaybillOld.getPackType())) {
+                String packTypeName = DictUtils.getDictLabel("emis_tab_packing_type", emisWaybillOld.getPackType());
+                fillMap.put("packTypeName", packTypeName);
+            }else{
+                fillMap.put("packTypeName", "");
+            }
+
+
             fillMap.put("sendProvinceName", emisWaybillOld.getSendProvinceName());
             fillMap.put("sendCityName", emisWaybillOld.getSendCityName());
 
@@ -4486,6 +4504,22 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             fillMap.put("wsAddress", emisWaybillOld.getIntoWarehouseAddress());
             fillMap.put("salesmen", emisWaybillOld.getSalesmen());
 
+            String salesmenPhone="";
+            if(!StringUtils.isEmpty(emisWaybillOld.getSalesmen())){
+                SysUser salesmenUser = getEmisStaffByEmpName(emisWaybillOld.getSalesmen());
+                if (salesmenUser != null) {
+                    salesmenPhone=salesmenUser.getPhonenumber();
+                }
+            }
+            fillMap.put("salesmenPhone", salesmenPhone);
+            fillMap.put("orderRemark", emisWaybillOld.getOrderRemark());
+            if(!StringUtils.isEmpty(emisWaybillOld.getPackType())) {
+                String packTypeName = DictUtils.getDictLabel("emis_tab_packing_type", emisWaybillOld.getPackType());
+                fillMap.put("packTypeName", packTypeName);
+            }else{
+                fillMap.put("packTypeName", "");
+            }
+
             fillMap.put("sendProvinceName", emisWaybillOld.getSendProvinceName());
             fillMap.put("sendCityName", emisWaybillOld.getSendCityName());