ccjgmwz 3 年之前
父节点
当前提交
f827badf0f

+ 1 - 1
winsea-haixin-platform-backend/src/main/resources/application-prod.yml

@@ -7,7 +7,7 @@ spring:
   datasource:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
     driver-class-name: com.mysql.jdbc.Driver
     password: Ccj841968545
     password: Ccj841968545
-    url: jdbc:mysql://47.100.3.209:3306/ylyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.100.3.209:3306/yiliangyiyun_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
     username: root
   redis:
   redis:
     database: 0
     database: 0

+ 1 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -1286,6 +1286,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                             .eq("delete_flag",0));
                             .eq("delete_flag",0));
             if (contractManagementInfo != null){
             if (contractManagementInfo != null){
                 warehouseInOutInfo.setContractManagementInfo(contractManagementInfo);
                 warehouseInOutInfo.setContractManagementInfo(contractManagementInfo);
+                compId = contractManagementInfo.getCompId();
             }else {
             }else {
                 compId = inOutWarehouseTask.getCompId();
                 compId = inOutWarehouseTask.getCompId();
                 warehouseInOutInfo.setReceiveWarehouse(inOutWarehouseTask.getReceiveWarehouse());
                 warehouseInOutInfo.setReceiveWarehouse(inOutWarehouseTask.getReceiveWarehouse());