平和接口问题修改

api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java

@@ -228,7 +228,7 @@ public class PhxyyClient {
             udiwmsOrderRequest.setCorpName(thrCorpEntity.getName()); //往来单位名称，需转换为第三方系统的名称
         }
 
-        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(orderEntity.getFromSubInvCode());
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(orderEntity.getInvStorageCode());
         try {
             ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(invWarehouseEntity.getThirdId(), thirdId);
             udiwmsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode());
@@ -236,6 +236,16 @@ public class PhxyyClient {
         } catch (Exception e) {
             log.error("查询第三方系统仓库异常", e);
         }
+
+        if (StrUtil.nullToEmpty(thirdSysBusApiEntity.getUrl()).equals("useOut")) {
+            udiwmsOrderRequest.setCorpId(udiwmsOrderRequest.getLocStorageCode());
+            udiwmsOrderRequest.setCorpName(udiwmsOrderRequest.getLocStorageName());
+            ThrInvWarehouseEntity deviceInv = thrInvWarehouseDao.selectByCode("29", thirdId);
+            udiwmsOrderRequest.setLocStorageCode("29");
+            udiwmsOrderRequest.setLocStorageName(deviceInv.getName());
+        }
+
+
         udiwmsOrderRequest.setBillFlag("1");
         //查询单据出入库类型
         String mainAction = bussinessTypeDao.selectInoutTypebByLocalAction(stockOrderEntity.getBillType());

api-sync/src/main/resources/application-pro.properties

@@ -2,7 +2,7 @@
 server.port=9997
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms_erp?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-spring.datasource.jdbc-url=jdbc:mysql://192.168.0.109:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.109:3306/udiwms_ph1?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 #spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
@@ -33,7 +33,7 @@ FILE_VERSION_FLAG=ZHIYE_V1
 #接口实时获取
 #0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.PHXYY(平和县医院)
 #5.ZAXZYY(诏安县医院)
-ONLINE_VESRION_FLAG=TEST
+ONLINE_VESRION_FLAG=PHXYY
 THIRD_ID=thirdId
 ok.http.connect-timeout=3000
 ok.http.read-timeout=3000