1

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

@@ -269,6 +269,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             warehouseInOutInfo.setCost(qualityInspectionManagement1.getCost());
             warehouseInOutInfoService.updateById(warehouseInOutInfo);
         }
+
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
         //成功返回ok
         if (one ) {
             return "OK";

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

@@ -555,29 +555,30 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editWarehouse(WarehouseBaseInfo warehouseBaseInfo) {
+        WarehouseBaseInfo warehouseBaseInfo1=this.selectById(warehouseBaseInfo.getId());
         String personPhone = warehouseBaseInfo.getPersonPhone();
         String otherPhone = warehouseBaseInfo.getOtherPersonPhone();
-        this.updateById(warehouseBaseInfo);
         if(personPhone != null){
-            if(!personPhone.equals(warehouseBaseInfo.getPersonPhone())){
+            if(!personPhone.equals(warehouseBaseInfo1.getPersonPhone())){
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
         }
         else{
-            if(warehouseBaseInfo.getPersonPhone()!=null){
+            if(warehouseBaseInfo1.getPersonPhone()!=null){
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
         }
         if(otherPhone != null){
-            if(!otherPhone.equals(warehouseBaseInfo.getOtherPersonPhone())){
+            if(!otherPhone.equals(warehouseBaseInfo1.getOtherPersonPhone())){
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
         }
         else{
-            if(warehouseBaseInfo.getOtherPersonPhone()!=null){
+            if(warehouseBaseInfo1.getOtherPersonPhone()!=null){
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
         }
+        this.updateById(warehouseBaseInfo);
         if (warehouseBaseInfo.getWarehouseType().equals("1")) {
             List<WarehousePositionInfo> warehousePositionInfoList = warehouseBaseInfo.getWarehousePositionInfoList();
             if (!CollectionUtils.isEmpty(warehousePositionInfoList)) {

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

@@ -117,9 +117,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         }
         pageView.put("managementType", weighingManagement.getManagementType());
         pageView.put("warehouseName", weighingManagement.getWarehouseName());
-        List<WeighingManagement> listRedis = cacheComponent.getObjList(Const.ADMIN_WEIGHINGINFO+weighingManagement.getPageSize()+"_"+weighingManagement.getCurrentPage(),WeighingManagement.class);
+        List<WeighingManagement> listRedis = cacheComponent.getObjList(Const.ADMIN_WEIGHINGINFO+JSONObject.toJSONString(pageView),WeighingManagement.class);
         if(listRedis != null && listRedis.size() > 0 ){
-            Long countRedis = Long.parseLong(cacheComponent.getRaw(Const.ADMIN_WEIGHINGINFO_NUM+weighingManagement.getPageSize()+"_"+weighingManagement.getCurrentPage()));
+            Long countRedis = Long.parseLong(cacheComponent.getRaw(Const.ADMIN_WEIGHINGINFO_NUM+JSONObject.toJSONString(pageView)));
             Page<WeighingManagement> page = new Page<>();
             page.setRecords(listRedis == null ? Lists.newArrayList() : listRedis);
             page.setTotal(countRedis == null ? 0 : countRedis);
@@ -180,8 +180,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             }
         }
 
-        cacheComponent.putRaw(Const.ADMIN_WEIGHINGINFO+weighingManagement.getPageSize()+"_"+weighingManagement.getCurrentPage(), JSONObject.toJSONString(dataList),60*60*24);
-        cacheComponent.putRaw(Const.ADMIN_WEIGHINGINFO_NUM+weighingManagement.getPageSize()+"_"+weighingManagement.getCurrentPage(), dataList.size()+"",60*60*24);
+        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);
 
         Page<WeighingManagement> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
@@ -252,6 +252,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
 //                paymentManagementService.insert(paymentManagement1);
 //            }
 //        }
+
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
         if( weighingManagement.getGrossWeight() == null || weighingManagement.getGrossWeight() == 0){
             throw new YException(YExceptionEnum.GROSSWEIGHT_NULL);
         }
@@ -347,6 +350,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         if( weighingManagement.getTare() == null || weighingManagement.getTare() == 0){
             throw new YException(YExceptionEnum.TARE_NULL);
         }
+
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
         boolean one = this.updateById(weighingManagement);
         if (one) {
             return weighingManagement.getId();
@@ -550,6 +556,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         qualityInspectionManagement.setQualityDate(new Date());
         qualityInspectionManagement.setWarehouseName(weighingManagement.getWarehouseName());
         qualityInspectionManagement.setStorageTagNo(weighingManagement.getStorageNumber());
+
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
         boolean two=qualityInspectionManagementService.insert(qualityInspectionManagement);
         boolean one=this.insert(weighingManagement);
         //成功返回ok
@@ -571,6 +580,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         //状态改为已称皮重
         weighingManagement.setStatus(StatusEnum.TARED.getName());
         weighingManagement.setStatusFlag(StatusEnum.TARED.getFlag());
+
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
         //更新检斤信息
         boolean one = this.updateById(weighingManagement);
         //更新质检信息
@@ -704,6 +716,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 }
             }
         }
+
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
         return "OK";
     }
 
@@ -799,6 +814,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 }
             }
         }
+
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
+        cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
         return "OK";
     }
 

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

@@ -45,6 +45,8 @@
         purpose,
         expense_name as expenseName,
         cost_type as costType,
+        contract_no as contractNo,
+        warehouse_name as warehouseName,
         expenses_purpose as expensesPurpose,
         amount_money as amountMoney,
         unallocated_amount as unallocatedAmount,