【越加红】【WMS对接】【出货单新增对接字段“固定条款交货”】

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

@@ -24,6 +24,7 @@ public class DeliveryOrder {
     private String documenter; // 制单人
     private String externalCollection; // 外部收款方式
     private String shopName; // 入库仓
+    private String fixedTermsDelivery; // 固定条款交货
 
     private ReceiverInfo receiverInfo;//收货信息
 

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

@@ -38,6 +38,6 @@ public class ProdInout {
     private String piWbsk;//客户简称 pi_wbsk_user
     private String piSourcecode;//来源收料通知单
     private String rkck;//pi_1111_user
-
+    private String gdtkdz ;//固定条款交货  nvl(cu_gdtkjh_user, '客户资料无交货条款 ')  pd_gdtkdz_user
 
 }

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

@@ -122,8 +122,8 @@ public class DocCommonServiceImpl implements DocCommonService {
                 .append("pi_Recordman piRecordman,to_char(pi_recorddate,'yyyy-mm-dd hh24:mi:ss') piRecorddate,pi_Remark piRemark,")
                 .append("abs(nvl(pi_sendwmsflag,0)) piSendwmsflag,nvl(pi_WmsInType,'in') piWmsInType,pi_wmsstatus piWmsstatus,")
                 .append("pi_invostatuscode piInvoStatusCode,'"+master+"' currentMaster,pi_tomaster toMasterCode,pi_purposename piLxr,pi_expresscode piLxdh,pi_address piKhdz,pi_wbsk_user piWbsk" +
-                        ",pi_sourcecode piSourcecode,pi_1111_user rkck ")
-                .append("from ").append(master).append(".prodinout where pi_id = ").append(id)
+                        ",pi_sourcecode piSourcecode,pi_1111_user rkck,nvl(cu_gdtkjh_user, '客户资料无交货条款 ') gdtkdz ")
+                .append("from ").append(master).append(".prodinout left join ").append(master).append(".customer on cu_code=pi_cardcode where pi_id = ").append(id)
                 .toString();
         List<ProdInout> prodInOuts = baseDao.getJdbcTemplate().query(sql,
                 new BeanPropertyRowMapper<>(ProdInout.class));
@@ -269,6 +269,7 @@ public class DocCommonServiceImpl implements DocCommonService {
         deliveryOrder.setCreateTime(StringUtil.nvl(prodInOut.getPiRecordDate(),prodInOut.getPiDate()));
         deliveryOrder.setExternalCollection(prodInOut.getPiWbsk());
         deliveryOrder.setShopName(prodInOut.getRkck());//入库仓
+        deliveryOrder.setFixedTermsDelivery(prodInOut.getGdtkdz());//固定条款交货
         //调拨业务
         if(prodInOut.getPiWmsInType().equals("transfer")){
             deliveryOrder.setInWarehouseCode(vwmsConfig.getWarehouseCode());