【越加红】【WMS对接】【新增WMS货主字段】

src/main/java/com/uas/eis/config/VwmsConfig.java

@@ -12,6 +12,9 @@ public class VwmsConfig {
     private String ev;
     private String DC_MASTER;
 
+    @Value("${wmsOwnerCode}")
+    private String wmsOwnerCode;
+
     @Value("${api_url}")
     private String apiUrl;
 

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

@@ -14,6 +14,7 @@ public class DeliveryOrder {
     private String warehouseCode; // 出库仓库编码（物理仓）
     private String inWarehouseCode; // 调入仓库编码（物理仓） 条件必填，调拨出库业务类型该字段必填
     private String ownerCode; // 货主代码
+    private String wmsOwnerCode; // WMS货主 默认YUEJH
     private String inOwnerCode; // 目标货主编码 转库目标账套编码
     private String createTime; // 出库单创建时间 YYYY-MM-DD HH:MM:SS, 为空时WMS自动生成
     private String scheduleDate; // 要求出库时间

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

@@ -7,6 +7,7 @@ public class EntryOrder {
 //    private String outBizCode; // 外部业务代码 消息ID, 用于去重, 因为网络等原因导致重复传输, 请求不会被重复处理
     private String entryOrderCode; // 入库单号
     private String ownerCode; // 货主编码
+    private String wmsOwnerCode; // WMS货主 默认YUEJH
     private String warehouseCode; // 仓库编码
     private String orderCreateTime; // 订单创建时间
     private String orderType; // 入库单类型

src/main/java/com/uas/eis/entity/vwms/req/BaseItemReq.java

@@ -10,6 +10,7 @@ public class BaseItemReq<T> {
     private String actionType;
     private String warehouseCode;
     private String ownerCode;
+    private String wmsOwnerCode; // WMS货主 默认YUEJH
 //    private String outBizCode;
     @JacksonXmlProperty(localName = "item")
     private T item;

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

@@ -167,9 +167,10 @@ public class DocCommonServiceImpl implements DocCommonService {
         baseDao.execute(deleteDetailSql);
         // 插入主表数据
         String sql = new StringBuilder()
-                .append("INSERT INTO ").append(master).append(".prodiowms(ITIME,PIID, PIINOUTNO, ORDERCODE, OWNERCODE, WAREHOUSECODE, WMSORDERID, WMSORDERTYPE,OUTBIZCODE,TOOWNERCODE)")
+                .append("INSERT INTO ").append(master).append(".prodiowms(ITIME,PIID, PIINOUTNO, ORDERCODE,OWNERCODE, WMSOWNERCODE, WAREHOUSECODE, WMSORDERID, WMSORDERTYPE,OUTBIZCODE,TOOWNERCODE)")
                 .append(" select sysdate,pi_id,pi_inoutno,pi_inoutno,'")
                 .append(prodInOut.getCurrentMaster()).append("','")
+                .append(vwmsConfig.getWmsOwnerCode()).append("','")
                 .append(vwmsConfig.getWarehouseCode()).append("',PI_WMSORDERCODE,PI_WMSORDERTYPE,'").append(prodInOut.getOutBizCode()).append("','"+StringUtil.nvl(prodInOut.getToMasterCode(),"")+"'")
                 .append(" from ").append(master).append(".prodinout where pi_id = ").append(prodInOut.getPiId())
                 .toString();
@@ -238,6 +239,7 @@ public class DocCommonServiceImpl implements DocCommonService {
         deliveryOrder.setOrderType(prodInOut.getPiOrderType());// 订单类型
         deliveryOrder.setWarehouseCode(vwmsConfig.getWarehouseCode());// 仓库编码
         deliveryOrder.setOwnerCode(prodInOut.getCurrentMaster());// 货主编码
+        deliveryOrder.setWmsOwnerCode(vwmsConfig.getWmsOwnerCode());//WMS货主 默认YUEJH
         deliveryOrder.setCreateTime(StringUtil.nvl(prodInOut.getPiRecordDate(),prodInOut.getPiDate()));
         deliveryOrder.setExternalCollection(prodInOut.getPiWbsk());
         deliveryOrder.setShopName(prodInOut.getRkck());//入库仓
@@ -286,6 +288,7 @@ public class DocCommonServiceImpl implements DocCommonService {
         EntryOrder entryOrder = new EntryOrder();
         entryOrder.setEntryOrderCode(prodInOut.getPiInoutno());// 入库单号
         entryOrder.setOwnerCode(prodInOut.getCurrentMaster());// 货主编码
+        entryOrder.setWmsOwnerCode(vwmsConfig.getWmsOwnerCode());//WMS货主 默认YUEJH
         entryOrder.setWarehouseCode(vwmsConfig.getWarehouseCode());// 仓库编码
         entryOrder.setOrderCreateTime(prodInOut.getPiRecordDate());// 订单创建时间
         entryOrder.setOrderType(prodInOut.getPiOrderType());// 订单类型

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

@@ -140,6 +140,7 @@ public class ERPServiceImpl implements ERPService {
         prodBaseItemReq.setActionType(actionType);
         prodBaseItemReq.setWarehouseCode(vwmsConfig.getWarehouseCode());
         prodBaseItemReq.setOwnerCode(ownerCode);
+        prodBaseItemReq.setWmsOwnerCode(vwmsConfig.getWmsOwnerCode());//WMS货主 默认YUEJH
         prodBaseItemReq.setItem(productReq);
         try {
             // 创建XmlMapper实例

src/main/resources/vwms.properties

@@ -2,7 +2,7 @@ api_url=http://1.12.53.214:8085/api/edi/qimen/service
 app_key=YJHUAS
 customerId=YJH
 vwms.warehouse.code=YJHCK
-#ownerCode=YUEJH
+wmsOwnerCode=YUEJH
 
 #????:
 #api_url_test=http://vpn-nj.hr-network.cn:285/api/edi/qimen/service