更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -188,7 +188,7 @@ public class BiInfoController {
             userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                contractManagementInfoEntityWrapper.eq("joint_venture_parties", "洮南市二龙乡瀚城农产品有限公司");
+                contractManagementInfoEntityWrapper.eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司");
             }
         }
 //        if (seachMoth != null) {
@@ -237,7 +237,7 @@ public class BiInfoController {
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                contractManagementInfoEntityWrapper.eq("joint_venture_parties", "洮南市二龙乡瀚城农产品有限公司");
+                contractManagementInfoEntityWrapper.eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司");
             }
         }
         List<ContractManagementInfo> contractManagementInfos = contractManagementInfoService.selectList(contractManagementInfoEntityWrapper);
@@ -275,7 +275,7 @@ public class BiInfoController {
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                warehouseBaseInfoEntityWrapper.eq("joint_venture_parties", "洮南市二龙乡瀚城农产品有限公司");
+                warehouseBaseInfoEntityWrapper.eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司");
             }
         }
         List<WarehouseBaseInfo> warehouseBaseInfoList = warehouseBaseInfoService.selectList(warehouseBaseInfoEntityWrapper);
@@ -326,7 +326,7 @@ public class BiInfoController {
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                warehouseBaseInfoEntityWrapper.eq("joint_venture_parties", "洮南市二龙乡瀚城农产品有限公司");
+                warehouseBaseInfoEntityWrapper.eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司");
             }
         }
         Integer countWare = warehouseBaseInfoService.selectCount(warehouseBaseInfoEntityWrapper);
@@ -343,7 +343,7 @@ public class BiInfoController {
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
                 List<WarehouseBaseInfo> warehouseBaseInfoList = warehouseBaseInfoService.selectList(new EntityWrapper<WarehouseBaseInfo>()
                         .eq("comp_id", companyId).eq("delete_flag", "0").eq("warehouse_type", "1")
-                        .eq("joint_venture_parties", "洮南市二龙乡瀚城农产品有限公司"));
+                        .eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司"));
                 if (CollectionUtils.isNotEmpty(warehouseBaseInfoList)){
                     for (int i = 0;i<warehouseBaseInfoList.size();i++){
                         List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
@@ -413,7 +413,7 @@ public class BiInfoController {
                             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
                             //洮南瀚城合营人员查看
                             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                                warehouseBaseInfoEntityWrapper.eq("joint_venture_parties", "洮南市二龙乡瀚城农产品有限公司");
+                                warehouseBaseInfoEntityWrapper.eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司");
                             }
                         }
                         WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(warehouseBaseInfoEntityWrapper);
@@ -425,7 +425,7 @@ public class BiInfoController {
                             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
                             //洮南瀚城合营人员查看
                             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                                contractManagementInfoEntityWrapper.eq("joint_venture_parties", "洮南市二龙乡瀚城农产品有限公司");
+                                contractManagementInfoEntityWrapper.eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司");
                             }
                         }
                         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(contractManagementInfoEntityWrapper);
@@ -445,7 +445,7 @@ public class BiInfoController {
                             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
                             //洮南瀚城合营人员查看
                             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                                warehouseBaseInfoEntityWrapper.eq("joint_venture_parties", "洮南市二龙乡瀚城农产品有限公司");
+                                warehouseBaseInfoEntityWrapper.eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司");
                             }
                         }
                         WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(warehouseBaseInfoEntityWrapper);
@@ -456,7 +456,7 @@ public class BiInfoController {
                             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
                             //洮南瀚城合营人员查看
                             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                                warehouseBaseInfoEntityWrapper1.eq("joint_venture_parties", "洮南市二龙乡瀚城农产品有限公司");
+                                warehouseBaseInfoEntityWrapper1.eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司");
                             }
                         }
                         WarehouseBaseInfo warehouseBaseInfo1 = warehouseBaseInfoService.selectOne(warehouseBaseInfoEntityWrapper1);
@@ -509,7 +509,7 @@ public class BiInfoController {
 //        Double sumAct = warehousePositionStorageInfoService.selectSumStoreage(companyId);
         String jointVentureParties = null;
         if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-            jointVentureParties ="洮南市二龙乡瀚城农产品有限公司";
+            jointVentureParties ="洮南市鸿胜粮贸有限公司";
         }
         Double inWeight = warehousePositionStorageInfoMapper.selectSumWareNew(companyId, null,"2",seachMoth,jointVentureParties);
         Double outWeight = warehousePositionStorageInfoMapper.selectSumWareNew(companyId, null,"1",seachMoth,jointVentureParties);
@@ -603,7 +603,7 @@ public class BiInfoController {
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                contractManagementInfoEntityWrapper.eq("joint_venture_parties", "洮南市二龙乡瀚城农产品有限公司");
+                contractManagementInfoEntityWrapper.eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司");
             }
         }
         List<ContractManagementInfo> contractManagementInfos = contractManagementInfoService.selectList(contractManagementInfoEntityWrapper);
@@ -712,7 +712,7 @@ public class BiInfoController {
                 String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
                 //洮南瀚城合营人员查看
                 if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                    pageView.put("jointVentureParties","洮南市二龙乡瀚城农产品有限公司");
+                    pageView.put("jointVentureParties","洮南市鸿胜粮贸有限公司");
                 }
             }
             pageView.put("seachMoth", seachMoth);
@@ -752,7 +752,7 @@ public class BiInfoController {
                 String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
                 //洮南瀚城合营人员查看
                 if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                    pageView.put("jointVentureParties","洮南市二龙乡瀚城农产品有限公司");
+                    pageView.put("jointVentureParties","洮南市鸿胜粮贸有限公司");
                 }
             }
 

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

@@ -1943,7 +1943,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                pageView.put("jointVentureParties","洮南市二龙乡瀚城农产品有限公司");
+                pageView.put("jointVentureParties","洮南市鸿胜粮贸有限公司");
             }
         }
         return baseMapper.selectSumSale(pageView);
@@ -1957,7 +1957,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                pageView.put("jointVentureParties","洮南市二龙乡瀚城农产品有限公司");
+                pageView.put("jointVentureParties","洮南市鸿胜粮贸有限公司");
             }
         }
         return baseMapper.selectSumBuy(pageView);

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

@@ -69,7 +69,7 @@ public class CostManagementInfoServiceImpl extends ServiceImpl<CostManagementInf
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                pageView.put("jointVentureParties","洮南市二龙乡瀚城农产品有限公司");
+                pageView.put("jointVentureParties","洮南市鸿胜粮贸有限公司");
             }
         }
         List<CostManagementInfo> costManagementInfoList = baseMapper.getListByCondition(pageView);
@@ -102,7 +102,7 @@ public class CostManagementInfoServiceImpl extends ServiceImpl<CostManagementInf
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                pageView.put("jointVentureParties","洮南市二龙乡瀚城农产品有限公司");
+                pageView.put("jointVentureParties","洮南市鸿胜粮贸有限公司");
             }
         }
         List<CostManagementInfo> costManagementInfoList = baseMapper.getListByConditionBi(pageView);

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

@@ -393,7 +393,7 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                pageView.put("jointVentureParties","洮南市二龙乡瀚城农产品有限公司");
+                pageView.put("jointVentureParties","洮南市鸿胜粮贸有限公司");
             }
         }
         String  amonutIn = baseMapper.getAmonutIn(pageView);

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

@@ -2757,7 +2757,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                pageView.put("jointVentureParties","洮南市二龙乡瀚城农产品有限公司");
+                pageView.put("jointVentureParties","洮南市鸿胜粮贸有限公司");
             }
         }
         return baseMapper.selectCountCompany(pageView);
@@ -2771,7 +2771,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                pageView.put("jointVentureParties","洮南市二龙乡瀚城农产品有限公司");
+                pageView.put("jointVentureParties","洮南市鸿胜粮贸有限公司");
             }
         }
         return baseMapper.selectCountCompanyZT(pageView);

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

@@ -46,7 +46,7 @@ public class WarehousePositionStorageInfoServiceImpl extends ServiceImpl<Warehou
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
             //洮南瀚城合营人员查看
             if("647b84ee01044e2a8d4fdc1943ce3d01,ec7024427b7347b98bcad422761e5bfc,23eff8bab2ed4af38a1be1315ce7046d,d958ef5aa62849039802356a63f6e7ca".contains(userId)){
-                pageView.put("jointVentureParties","洮南市二龙乡瀚城农产品有限公司");
+                pageView.put("jointVentureParties","洮南市鸿胜粮贸有限公司");
             }
         }
        return baseMapper.selectSumStoreage(pageView);

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

@@ -138,6 +138,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
     private IEnabledInfoService enabledInfoService;
     @Autowired
     private IWarehousingOrderRecordService warehousingOrderRecordService;
+
+    @Autowired
+    private IWarehouseBaseInfoService warehouseBaseInfoService;
     @Value("${com.yiliangyiyun.env}")
     private String ENV;
 
@@ -1799,12 +1802,14 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder1.setCreater(commonStaff.getStaffName());
                 }
             }
+            WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(dataList.get(0).getBaseId());
             warehousingOrder1.setWarehouseName(dataList.get(0).getWarehouseName());
             warehousingOrder1.setIssuingTime(dataList.get(0).getIssuingTime());
             warehousingOrder1.setApproveStatus(dataList.get(0).getApproveStatus());
             warehousingOrder1.setRequestPerson(dataList.get(0).getRequestPerson());
             warehousingOrder1.setRequestDate(dataList.get(0).getRequestDate());
             warehousingOrder1.setWarehousingOrderList(dataList);
+            warehousingOrder1.setJointVentureParties(warehouseBaseInfo.getJointVentureParties());
             String taskId = "";
             // 只有待审核状态才有taskId
             if (StringUtils.isNotBlank(dataList.get(0).getWorkflowId())) {

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

@@ -189,7 +189,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         }
 
         cacheComponent.putRaw(Const.ADMIN_WEIGHINGINFO+JSONObject.toJSONString(pageView), JSONObject.toJSONString(dataList),60*60*24);
-        cacheComponent.putRaw(Const.ADMIN_WEIGHINGINFO_NUM+JSONObject.toJSONString(pageView), dataList.size()+"",60*60*24);
+        cacheComponent.putRaw(Const.ADMIN_WEIGHINGINFO_NUM+JSONObject.toJSONString(pageView), dataCount+"",60*60*24);
 
         Page<WeighingManagement> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);