【华信科】【富勒WMS对接】【出库单创建】【收货人为空默认值】

src/main/java/com/uas/eis/entity/vwms/entity/ProdInout.java

@@ -26,6 +26,7 @@ public class ProdInout {
     private String piInvoStatusCode;//审核状态：ENTERING、COMMITED、AUDITED
     private String piLxr;//收货人
     private String piLxdh;//收货电话
+    private String piShrsj;//收货手机
     private String piKhdz;//收货地址
 
 

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -729,9 +729,9 @@ public class ERPServiceImpl implements ERPService {
         deliveryOrder.setCreateTime(prodInOut.getPiRecordDate());
         deliveryOrder.setRemark(prodInOut.getPiRemark());// 备注
         DeliveryOrder.ReceiverInfo receiverInfo = new DeliveryOrder.ReceiverInfo();
-        receiverInfo.setName(prodInOut.getPiLxr());
-        receiverInfo.setMobile(prodInOut.getPiLxdh());
-        receiverInfo.setDetailAddress(prodInOut.getPiKhdz());
+        receiverInfo.setName(StringUtil.nvl(prodInOut.getPiLxr(),"无"));
+        receiverInfo.setMobile(StringUtil.nvl(StringUtil.nvl(prodInOut.getPiLxdh(),prodInOut.getPiShrsj()),"无"));
+        receiverInfo.setDetailAddress(StringUtil.nvl(prodInOut.getPiKhdz(),"无"));
         deliveryOrder.setReceiverInfo(receiverInfo);
         //写入明细表
         List<OrderLineOut> orderLineOuts = (List<OrderLineOut>) getOrderLines(prodInOut, masterName);
@@ -958,7 +958,7 @@ public class ERPServiceImpl implements ERPService {
                 "select pi_Wmsordertype piOrderType,pi_id piId,pi_inoutno piInoutno,pi_class piClass,pi_type piType,to_char(pi_recorddate,'yyyy-mm-dd hh24:mi:ss') piDate" +
                         ",pi_Cardcode piCardcode,pi_Title piTitle,pi_Recordman piRecordman,to_char(pi_recorddate,'yyyy-mm-dd hh24:mi:ss') piRecorddate,pi_Remark piRemark" +
                         ",abs(nvl(pi_sendwmsflag,0)) piSendwmsflag,nvl(pi_WmsInType,'in') piWmsInType,pi_wmsstatus piWmsstatus" +
-                        ",pi_invostatuscode piInvoStatusCode,pi_lxr_user piLxr,pi_lxdh_user piLxdh,pi_khdz_user piKhdz " +
+                        ",pi_invostatuscode piInvoStatusCode,pi_lxr_user piLxr,pi_lxdh_user piLxdh,pi_shrsj_user piShrsj,pi_khdz_user piKhdz " +
                         " from "+master+".prodinout where pi_id = "+id,
                 new BeanPropertyRowMapper<ProdInout>(ProdInout.class));
         ProdInout prodInOut = prodInOuts.get(0);