diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 7b06445..c37fa9f 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1499,13 +1499,11 @@ public class CtqyyClient extends CommonHttpClient { ioCollectOrder.setBillNo(info.getPHYSIC_CODE()); ioCollectOrder.setFromType("HIS系统"); ioCollectOrder.setBillTime(DateUtil.parseDate(info.getKEEP_BOOK_TIME())); - if (info.getIO_FLAG().equals("I")) { - ioCollectOrder.setFromCorp(info.getCONSIGNOR()); - ioCollectOrder.setFromCorpName(info.getCONSIGNOR_NAME()); - } else { - ioCollectOrder.setFromCorp(info.getCONSIGNEE()); - ioCollectOrder.setFromCorpName(info.getCONSIGNEE_NAME()); - } + ioCollectOrder.setFromCorp(info.getCONSIGNEE()); + ioCollectOrder.setFromCorpName(info.getCONSIGNEE_NAME()); + + ioCollectOrder.setShipper(info.getCONSIGNOR()); + ioCollectOrder.setShipperName(info.getCONSIGNOR_NAME()); ioCollectOrder.setBusType(udiwmsThrOrderRequest.getBusType()); ioCollectOrder.setWorkPlaceCode(udiwmsThrOrderRequest.getWorkPlaceCode()); diff --git a/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java b/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java index b760e63..4604d89 100644 --- a/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java +++ b/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java @@ -48,6 +48,12 @@ public class IoCollectOrder implements Serializable { */ @TableField(value = "fromTypeDesc") private String fromTypeDesc; + @TableField(value = "shipper") + private String shipper; + + @TableField(value = "shipperName") + private String shipperName; + /** * 往来信息 @@ -56,7 +62,6 @@ public class IoCollectOrder implements Serializable { private String fromCorp; - @TableField(value = "fromCorpName") private String fromCorpName; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index fa1224c..318f86a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ spring: strict: false datasource: master: - url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver