平和县医院转第三方产品编码bug

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

@@ -332,12 +332,13 @@ public class PhxyyClient {
                 item.setSecSalesListNo(stockOrderDetailEntity.getSecSalesListNo());
                 ThrProductsEntity thrProductsEntity = submitOrderUtils.toProduct(stockOrderDetailEntity, thirdId);
                 if (StrUtil.isEmpty(thrProductsEntity.getCode())) {
-                    item.setProductId(thrProductsEntity.getCode());
-                    item.setProductName(thrProductsEntity.getName());
                     uploadLog.setStatus(3);
                     uploadLog.setResult("提交失败，错误信息：" + "产品DI未关联第三方产品信息");
                     stockOrderUploadLogService.insertOrUpdate(uploadLog);
                     return ResultVOUtils.error(500, "提交失败");
+                } else {
+                    item.setProductId(thrProductsEntity.getCode());
+                    item.setProductName(thrProductsEntity.getName());
                 }
 
                 items.add(item);

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://127.0.0.1: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_ph3?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
@@ -29,15 +29,15 @@ API_KEY=1102
 API_SECRET=4dc07484afd34e8083ba96e8fe564224
 #文件导入
 #0.NULL(空，未配置），1.GLXP(自定义规范标准），2.ZHIYE_V1(智业V1,诏安医院),3.YG_UDPLAT_V1(阳光采购平台）,4.PHXYY(平和县医院)
-FILE_VERSION_FLAG=PHXYY
+FILE_VERSION_FLAG=GLXP
 #接口实时获取
 #0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.PHXYY(平和县医院)
 #5.ZAXZYY(诏安县医院)
 ONLINE_VESRION_FLAG=PHXYY
 THIRD_ID=thirdId
-ok.http.connect-timeout=3000
-ok.http.read-timeout=3000
-ok.http.write-timeout=3000
+ok.http.connect-timeout=30000
+ok.http.read-timeout=30000
+ok.http.write-timeout=30000
 # 连接池中整体的空闲连接的最大数量
 ok.http.max-idle-connections=200
 # 连接空闲时间最多为 300 秒