Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -12,7 +12,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   profiles:
-    active: local
+    active: prod
   resources:
     static-locations: file:///winsea/static/
   thymeleaf:
@@ -25,7 +25,7 @@ spring:
 #运行环境 1.开发环境 2.测试环境 3.生产环境
 com:
   yiliangyiyun:
-    env: 1
+    env: 3
 
 auth:
   anon-methods:

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -1352,6 +1352,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             // 插入操作历史
             this.billOperateHisService.saveBillOperateHis(contractManagementInfo.getId(), NumberConstant.CONSTANT_CONTRACT, staffName, null,
                     contractManagementInfo.getStatus(), null, "");
+
+            cacheComponent.delPrefixKey(Const.ADMIN_CONTRACTINFO);
             return "OK";
         }
         cacheComponent.delPrefixKey(Const.ADMIN_CONTRACTINFO);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -1755,11 +1755,11 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder1.setImperfectGrain(dataList1.get(j).getImperfectGrain());
                     warehousingOrder1.setJiaorenli(dataList1.get(j).getJiaorenli());
                     warehousingOrder1.setWaterContent(dataList1.get(j).getWaterContent());
-                    if ("潮粮".contains(dataList1.get(j).getGoodsName())) {
+                    if (dataList1.get(j).getGoodsName().contains("潮粮")) {
                         //单价=（潮粮单价-扣单价）*1000
                         warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
                     } else {
-                        warehousingOrder1.setPrice((dataList1.get(j).getSolidGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
+                        warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
                     }
                 }
             }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/CostManagementInfoMapper.xml

@@ -15,18 +15,20 @@
         FROM
         warehouse_in_out_info wioi
         WHERE
-        wioi.warehouse_name = wbi.warehouse_name
+        wioi.base_id = wbi.id
         AND wioi.delete_flag = 0
         AND wioi.in_out_flag = 2
+        AND wioi.create_date >=#{searchMoth}
         ),0) - IFNULL((
         SELECT
         sum( wioi.net_weight )
         FROM
         warehouse_in_out_info wioi
         WHERE
-        wioi.warehouse_name = wbi.warehouse_name
+        wioi.base_id = wbi.id
         AND wioi.delete_flag = 0
         AND wioi.in_out_flag = 1
+        AND wioi.create_date >=#{searchMoth}
         ) ,0)
         END AS STORAGE,
         (
@@ -54,7 +56,17 @@
         AND ( cmi.id IS NOT NULL OR wpsi.`storage` > 0 )
         AND wbi.delete_flag = 0
         AND wbi.comp_id =#{compId}
-        AND wbi.create_date >=#{searchMoth}
+        AND EXISTS (
+            SELECT
+            1
+            FROM
+            warehouse_in_out_info wioi
+            WHERE
+            wioi.base_id = wbi.id
+            AND wioi.delete_flag = 0
+            AND wioi.in_out_type = '收购入库'
+            AND wioi.create_date >= #{searchMoth}
+        )
         <if test="jointVentureParties != null">
             AND wbi.joint_venture_parties = #{jointVentureParties}
         </if>

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -102,6 +102,7 @@
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement">
         SELECT
+        distinct
         a.id,
         a.comp_id as compId,
         a.payment_no as paymentNo,

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -34,6 +34,7 @@
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.view.ExportVView">
         SELECT
+        distinct
         c.comp_name as compName,
         a.warehouse_name as warehouseName,
         q.bin_number as binNumber,