diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java index 5b1bf59..28e67d8 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java @@ -225,6 +225,9 @@ public class YxzyyClient { ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(invWarehouseEntity.getThirdId(), thirdId); udiwmsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode()); udiwmsOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName()); + + udiwmsOrderRequest.setLocInvCode(thrInvWarehouseEntity.getCode()); + udiwmsOrderRequest.setLocInvName(thrInvWarehouseEntity.getName()); } else { return ResultVOUtils.error(500, "未绑定第三方仓库!"); } @@ -239,6 +242,9 @@ public class YxzyyClient { ThrInvWarehouseEntity deviceInv = thrInvWarehouseDao.selectByCode("29", thirdId); udiwmsOrderRequest.setLocStorageCode("29"); udiwmsOrderRequest.setLocStorageName(deviceInv.getName()); + + udiwmsOrderRequest.setLocInvCode("29"); + udiwmsOrderRequest.setLocInvName(deviceInv.getName()); } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxOrderRequest.java index aec8031..7f000ff 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxOrderRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxOrderRequest.java @@ -20,6 +20,9 @@ public class YxOrderRequest { private String locStorageCode; //当前仓库 private String locStorageName; //当前仓库名称 + private String locInvCode; //当前仓库 + private String locInvName; //当前仓库名称 + private String useDeptCode; private String useDeptName; diff --git a/api-sync/src/main/resources/application-pro.properties b/api-sync/src/main/resources/application-pro.properties index 6ad66ae..7f2ec05 100644 --- a/api-sync/src/main/resources/application-pro.properties +++ b/api-sync/src/main/resources/application-pro.properties @@ -28,12 +28,12 @@ UDIWMS_IP=http://127.0.0.1:9991 API_KEY=1102 API_SECRET=4dc07484afd34e8083ba96e8fe564224 #\u6587\u4EF6\u5BFC\u5165 -#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09\uFF0C1.GLXP(\u81EA\u5B9A\u4E49\u89C4\u8303\u6807\u51C6\uFF09\uFF0C2.ZHIYE_V1(\u667A\u4E1AV1,\u8BCF\u5B89\u533B\u9662),3.YG_UDPLAT_V1(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0\uFF09,4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662), 5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXZXYY(\u4E91\u9704\u4E2D\u533B\u9662) -FILE_VERSION_FLAG=PHXYY +#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09\uFF0C1.GLXP(\u81EA\u5B9A\u4E49\u89C4\u8303\u6807\u51C6\uFF09\uFF0C2.ZHIYE_V1(\u667A\u4E1AV1,\u8BCF\u5B89\u533B\u9662),3.YG_UDPLAT_V1(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0\uFF09,4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662), 5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXXZYY(\u4E91\u9704\u4E2D\u533B\u9662) +FILE_VERSION_FLAG=YXXZYY #\u63A5\u53E3\u5B9E\u65F6\u83B7\u53D6 -#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09,1.YONGYOU_U8_V3.1(\u7528\u53CB3.1\u7248\u672C\uFF0C\u7247\u4ED4\u7640\u8BCA\u65AD\uFF09 2.YG_UDPLAT_V1.0(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0) 3.TEST(\u6807\u51C6\u63A5\u53E3\uFF0C\u6D4B\u8BD5\u7528),4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662),5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXZXYY(\u4E91\u9704\u4E2D\u533B\u9662) +#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09,1.YONGYOU_U8_V3.1(\u7528\u53CB3.1\u7248\u672C\uFF0C\u7247\u4ED4\u7640\u8BCA\u65AD\uFF09 2.YG_UDPLAT_V1.0(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0) 3.TEST(\u6807\u51C6\u63A5\u53E3\uFF0C\u6D4B\u8BD5\u7528),4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662),5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXXZYY(\u4E91\u9704\u4E2D\u533B\u9662) #5.ZAXZYY(\u8BCF\u5B89\u53BF\u533B\u9662) -ONLINE_VESRION_FLAG=PHXYY +ONLINE_VESRION_FLAG=YXXZYY THIRD_ID=thirdId ok.http.connect-timeout=30000 ok.http.read-timeout=30000