|
@@ -266,8 +266,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
// }
|
|
|
// }
|
|
|
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,commonStaff.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,commonStaff.getCompId());
|
|
|
if( weighingManagement.getGrossWeight() == null || weighingManagement.getGrossWeight() == 0){
|
|
|
throw new YException(YExceptionEnum.GROSSWEIGHT_NULL);
|
|
|
}
|
|
@@ -421,8 +421,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
throw new YException(YExceptionEnum.TARE_NULL);
|
|
|
}
|
|
|
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO, weighingManagement1.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM, weighingManagement1.getCompId());
|
|
|
boolean one = this.updateById(weighingManagement);
|
|
|
if (one) {
|
|
|
return weighingManagement.getId();
|
|
@@ -502,9 +502,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
else{
|
|
|
throw new YException(YExceptionEnum.PAYMENT_NOT_DELETED_ERROR);
|
|
|
}
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,weighingManagement.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,weighingManagement.getCompId());
|
|
|
}
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -684,8 +684,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
qualityInspectionManagement.setWarehouseName(weighingManagement.getWarehouseName());
|
|
|
qualityInspectionManagement.setStorageTagNo(weighingManagement.getStorageNumber());
|
|
|
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,weighingManagement.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,weighingManagement.getCompId());
|
|
|
boolean two=qualityInspectionManagementService.insert(qualityInspectionManagement);
|
|
|
boolean one=this.insert(weighingManagement);
|
|
|
//成功返回ok
|
|
@@ -707,15 +707,12 @@ 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);
|
|
|
//更新质检信息
|
|
|
boolean two = qualityInspectionManagementService.updateById(weighingManagement.getQualityInspectionManagement());
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,weighingManagement.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,weighingManagement.getCompId());
|
|
|
//成功返回ok
|
|
|
if (one &&two ) {
|
|
|
return weighingManagement.getId();
|
|
@@ -874,8 +871,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,weighingManagement1.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,weighingManagement1.getCompId());
|
|
|
return "OK";
|
|
|
}
|
|
|
|
|
@@ -982,8 +979,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,weighingManagement1.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,weighingManagement1.getCompId());
|
|
|
return "OK";
|
|
|
}
|
|
|
|
|
@@ -1019,8 +1016,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
warehouseInOutInfo.setPositionId(weighingManagement.getChangePositionId());
|
|
|
warehouseInOutInfoService.updateById(warehouseInOutInfo);
|
|
|
}
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,weighingManagement1.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,weighingManagement1.getCompId());
|
|
|
return "ok";
|
|
|
}
|
|
|
|
|
@@ -1109,8 +1106,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
}
|
|
|
warehouseInOutInfoService.updateById(warehouseInOutInfo);
|
|
|
}
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,weighingManagement1.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,weighingManagement1.getCompId());
|
|
|
return "ok";
|
|
|
}
|
|
|
|
|
@@ -1138,8 +1135,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
qualityInspectionManagement.setCustomerPhone(weighingManagement.getCustomerPhone());
|
|
|
qualityInspectionManagementService.updateById(qualityInspectionManagement);
|
|
|
}
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,weighingManagement1.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,weighingManagement1.getCompId());
|
|
|
return "ok";
|
|
|
}
|
|
|
|
|
@@ -1392,8 +1389,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,inOutWarehouseTask.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,inOutWarehouseTask.getCompId());
|
|
|
return "ok";
|
|
|
}
|
|
|
|
|
@@ -1860,8 +1857,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,inOutWarehouseTask.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,inOutWarehouseTask.getCompId());
|
|
|
return "ok";
|
|
|
}
|
|
|
|
|
@@ -2195,8 +2192,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO);
|
|
|
- cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM);
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,inOutWarehouseTask.getCompId());
|
|
|
+ cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,inOutWarehouseTask.getCompId());
|
|
|
return "ok";
|
|
|
}
|
|
|
}
|