fs-danaus
2022-08-22 f5a8155902fc540f44ed52d57343759729faec60
完善WMS推送功能
5个文件已修改
32 ■■■■ 已修改文件
src/com/yc/open/wms/entity/APIConfig.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/open/wms/entity/JinWuTestWmsAPI.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/open/wms/entity/JinWuWmsAPI.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/open/wms/entity/OuDeLiTianJinWmsAPI.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/open/wms/service/WMSServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/open/wms/entity/APIConfig.java
@@ -10,4 +10,5 @@
    public  String APP_KEY;
    public  String CUSTOMERID;
    public  String SECRET;
    public  String OWNERCODE;
}
src/com/yc/open/wms/entity/JinWuTestWmsAPI.java
@@ -12,6 +12,7 @@
        APP_KEY = "4d1d598839c2a574cdf2ae0f9afb313e";
        CUSTOMERID = "RongyaTest";
        SECRET = "7AY1NPQrmvLm108Kq1TXfOFHCvcluQYt";
        OWNERCODE="SZJW";
    }
}
src/com/yc/open/wms/entity/JinWuWmsAPI.java
@@ -12,6 +12,7 @@
        APP_KEY = "6b26f899d1c4c8be50df3ec929adab3d";
        CUSTOMERID = "Rongya";
        SECRET = "7AY1NPQrmvLm108Kq1TXfOFHCvcluQYt";
        OWNERCODE="SZJW";
    }
src/com/yc/open/wms/entity/OuDeLiTianJinWmsAPI.java
@@ -14,10 +14,11 @@
         PUSH_130301_LIST =",130301,";
        //--测试环境
         PUSH_URL="http://106.15.237.140/WMSOpenAPITest/Router";
         PUSH_URL="http://106.15.237.140/iWMSOpenAPITest/Router";
         APP_KEY="8f022406bb06152cf1414df258a6c445";
         CUSTOMERID="Rongya3";
         SECRET="7AY1NPQrmvLm108Kq1TXfOFHCvcluQYt";
         OWNERCODE="TJODL";
    }
   
src/com/yc/open/wms/service/WMSServiceImpl.java
@@ -7,6 +7,7 @@
import com.yc.open.jinwu.service.JinWuBaseService;
import com.yc.open.mutual.entity.PushEntity;
import com.yc.open.wms.entity.*;
import com.yc.open.wms.schedule.BaseThread;
import com.yc.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.dao.EmptyResultDataAccessException;
@@ -147,7 +148,8 @@
            Map headMap = list.get(0);
            DeliveryOrder deliveryOrder = new DeliveryOrder();
            deliveryOrder.setDeliveryOrderCode(GridUtils.prossRowSetDataType_String(headMap, "docCode"));
            deliveryOrder.setOwnerCode("SZJW");
            final APIConfig apiConfig = BaseThread.getAPIConfig(pushEntity.getDbId());
            deliveryOrder.setOwnerCode(apiConfig.OWNERCODE);
            deliveryOrder.setCreateTime(DateUtil.formatDate(GridUtils.prossRowSetDataType_String(headMap, "EnterDate"), "yyyy-MM-dd HH:mm:ss"));
            deliveryOrder.setScheduleDate(DateUtil.formatDate(GridUtils.prossRowSetDataType_String(headMap, "PreSendDate"), "yyyy-MM-dd"));
@@ -506,7 +508,8 @@
            Map headMap = list.get(0);
            DeliveryOrder deliveryOrder = new DeliveryOrder();
            deliveryOrder.setDeliveryOrderCode(GridUtils.prossRowSetDataType_String(headMap, "docCode"));
            deliveryOrder.setOwnerCode("SZJW");
            final APIConfig apiConfig = BaseThread.getAPIConfig(pushEntity.getDbId());
            deliveryOrder.setOwnerCode(apiConfig.OWNERCODE);
            deliveryOrder.setCreateTime(DateUtil.formatDate(GridUtils.prossRowSetDataType_String(headMap, "EnterDate"), "yyyy-MM-dd HH:mm:ss"));
@@ -670,7 +673,8 @@
            Map headMap = list.get(0);
            DeliveryOrder deliveryOrder = new DeliveryOrder();
            deliveryOrder.setDeliveryOrderCode(GridUtils.prossRowSetDataType_String(headMap, "docCode"));
            deliveryOrder.setOwnerCode("SZJW");
            final APIConfig apiConfig = BaseThread.getAPIConfig(pushEntity.getDbId());
            deliveryOrder.setOwnerCode(apiConfig.OWNERCODE);
            deliveryOrder.setCreateTime(DateUtil.formatDate(GridUtils.prossRowSetDataType_String(headMap, "EnterDate"), "yyyy-MM-dd HH:mm:ss"));
@@ -818,7 +822,8 @@
            Map headMap = list.get(0);
            DeliveryOrder deliveryOrder = new DeliveryOrder();
            deliveryOrder.setDeliveryOrderCode(GridUtils.prossRowSetDataType_String(headMap, "docCode"));
            deliveryOrder.setOwnerCode("SZJW");
            final APIConfig apiConfig = BaseThread.getAPIConfig(pushEntity.getDbId());
            deliveryOrder.setOwnerCode(apiConfig.OWNERCODE);
            deliveryOrder.setCreateTime(DateUtil.formatDate(GridUtils.prossRowSetDataType_String(headMap, "EnterDate"), "yyyy-MM-dd HH:mm:ss"));
@@ -974,7 +979,8 @@
            Map headMap = list.get(0);
            EntryOrder deliveryOrder = new EntryOrder();
            deliveryOrder.setEntryOrderCode(GridUtils.prossRowSetDataType_String(headMap, "docCode"));
            deliveryOrder.setOwnerCode("SZJW");
            final APIConfig apiConfig = BaseThread.getAPIConfig(pushEntity.getDbId());
            deliveryOrder.setOwnerCode(apiConfig.OWNERCODE);
            deliveryOrder.setPurchaseOrderCode(GridUtils.prossRowSetDataType_String(headMap, "GCDoccode"));
            deliveryOrder.setOrderCreateTime(DateUtil.formatDateTime(GridUtils.prossRowSetDataType_String(headMap, "DocDate"), "yyyy-MM-dd HH:mm:ss"));
@@ -1125,7 +1131,8 @@
            Map headMap = list.get(0);
            EntryOrder deliveryOrder = new EntryOrder();
            deliveryOrder.setEntryOrderCode(GridUtils.prossRowSetDataType_String(headMap, "docCode"));
            deliveryOrder.setOwnerCode("SZJW");
            final APIConfig apiConfig = BaseThread.getAPIConfig(pushEntity.getDbId());
            deliveryOrder.setOwnerCode(apiConfig.OWNERCODE);
            deliveryOrder.setOrderCreateTime(DateUtil.formatDateTime(GridUtils.prossRowSetDataType_String(headMap, "DocDate"), "yyyy-MM-dd HH:mm:ss"));
            String yuyuetime = GridUtils.prossRowSetDataType_String(headMap, "yuyuetime");
@@ -1281,7 +1288,8 @@
            Map headMap = list.get(0);
            EntryOrder deliveryOrder = new EntryOrder();
            deliveryOrder.setEntryOrderCode(GridUtils.prossRowSetDataType_String(headMap, "docCode"));
            deliveryOrder.setOwnerCode("SZJW");
            final APIConfig apiConfig = BaseThread.getAPIConfig(pushEntity.getDbId());
            deliveryOrder.setOwnerCode(apiConfig.OWNERCODE);
            deliveryOrder.setOrderCreateTime(DateUtil.formatDateTime(GridUtils.prossRowSetDataType_String(headMap, "DocDate"), "yyyy-MM-dd HH:mm:ss"));
@@ -1420,7 +1428,9 @@
            Map headMap = list.get(0);
            EntryOrder deliveryOrder = new EntryOrder();
            deliveryOrder.setEntryOrderCode(GridUtils.prossRowSetDataType_String(headMap, "docCode"));
            deliveryOrder.setOwnerCode("SZJW");
            final APIConfig apiConfig = BaseThread.getAPIConfig(pushEntity.getDbId());
            deliveryOrder.setOwnerCode(apiConfig.OWNERCODE);
            deliveryOrder.setOrderCreateTime(DateUtil.formatDateTime(GridUtils.prossRowSetDataType_String(headMap, "DocDate"), "yyyy-MM-dd HH:mm:ss"));