Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -109,7 +109,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		factoryPackageService.updateById(packageEntity);
 
 		JSONObject jo = new JSONObject();
-		jo.put("orderPackageCode",orderPackageCode);
+		jo.put("orderPackageCode",packageEntity.getCode());
 		jo.put("receivingTime",CommonUtil.dateToString(packageEntity.getUpdateTime()));
 
 		//真正的处理需要的数据

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java

@@ -270,9 +270,9 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		}
 
 		R r = warehouseUpdownTypeService.upShelfPackage(upShelfPackageList, allocationId,myCurrentWarehouse.getId());
-		if (r.getCode() == 200) {
+//		if (r.getCode() == 200) {
-			warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString());
+//			warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString());
-		}
+//		}
 		return r;
 	}
 
@@ -294,9 +294,9 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		}
 		//上架托盘
 		R r = warehouseUpdownTypeService.upShelfTray(trayCode, allocationId,myCurrentWarehouse.getId());
-		if (r.getCode() == 200) {
+//		if (r.getCode() == 200) {
-			warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString());
+//			warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString());
-		}
+//		}
 		return r;
 	}
 
@@ -319,9 +319,9 @@ public class WarehouseGoodsAllocationController extends BladeController {
 
 		//查询该库位的货物信息
 		R r = warehouseUpdownTypeService.upShelfStockList(upShelfStockList, allocationId,myCurrentWarehouse.getId());
-		if (r.getCode() == 200) {
+//		if (r.getCode() == 200) {
-			warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString());
+//			warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString());
-		}
+//		}
 		return r;
 
 	}
@@ -345,9 +345,9 @@ public class WarehouseGoodsAllocationController extends BladeController {
 
 		//查询该库位的货物信息
 		R r = warehouseUpdownTypeService.upShelfZeroOrder(upShelfZeroOrderList, allocationId,myCurrentWarehouse.getId());
-		if (r.getCode() == 200) {
+//		if (r.getCode() == 200) {
-			warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString());
+//			warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString());
-		}
+//		}
 		return r;
 	}
 
@@ -375,12 +375,12 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	@ApiOperationSupport(order = 18)
 	@ApiOperation(value = "货位 统计所有库位数量")
 	public R locationsnub() {
-//		if (null !=bladeRedis.get(Url+"/locationsnub)")){
+		if (null !=bladeRedis.get(Url+"/locationsnub)")){
-//			log.info("缓存取值>>>>>>>>>>");
+			log.info("缓存取值>>>>>>>>>>");
-//			return R.data(bladeRedis.get(Url+"/locationsnub"));
+			return R.data(bladeRedis.get(Url+"/locationsnub"));
-//		}
+		}
 		locationsnubVO locationsnubVO = warehouseGoodsAllocationService.selectlocationsnub();
-		//bladeRedis.setEx(Url+"/locationsnub",locationsnubVO,360L);
+		bladeRedis.setEx(Url+"/locationsnub",locationsnubVO,360L);
 		return R.data(locationsnubVO);
 	}
 
@@ -458,10 +458,10 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		}
 		try {
 		R r = warehouseUpdownTypeService.downPackage(upShelfPackageList);
-		if (r.getCode() == 200) {
+//		if (r.getCode() == 200) {
-			String prefix = Url+"/*";
+//			String prefix = Url+"/*";
-			bladeRedis.del(bladeRedis.keys(prefix));
+//			bladeRedis.del(bladeRedis.keys(prefix));
-		}
+//		}
 		return r;
 	} catch (CustomerException e) {
 		log.warn(e.message);
@@ -485,10 +485,10 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		}
 		try {
 		R r = warehouseUpdownTypeService.downZeroOrder(upShelfZeroOrderList);
-		if (r.getCode() == 200) {
+//		if (r.getCode() == 200) {
-			String prefix = Url+"/*";
+//			String prefix = Url+"/*";
-			bladeRedis.del(bladeRedis.keys(prefix));
+//			bladeRedis.del(bladeRedis.keys(prefix));
-		}
+//		}
 			return r;
 	} catch (CustomerException e) {
 		log.warn(e.message);
@@ -513,10 +513,10 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		}
 		try {
 			R r = warehouseUpdownTypeService.downStock(upShelfStockList);
-			if (r.getCode() == 200) {
+//			if (r.getCode() == 200) {
-				String prefix = Url+"/*";
+//				String prefix = Url+"/*";
-				bladeRedis.del(bladeRedis.keys(prefix));
+//				bladeRedis.del(bladeRedis.keys(prefix));
-			}
+//			}
 			return r;
 		} catch (CustomerException e) {
 			log.warn(e.message);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -649,6 +649,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				continue;
 			}
 		}
+		//更新货位缓存
+		warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
 		return Resp.scanSuccess("上架成功","成功上架"+num+"条");
 	}
 
@@ -801,6 +803,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				throw new CustomerException(code,r.getMsg());
 			}
 		}
+		//更新货位缓存
+		warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
 		return Resp.scanSuccess("上架成功","成功上架"+num+"条");
 	}
 
@@ -931,6 +935,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			}
 		}
 		String msg = "上架成功";
+		//更新货位缓存
+		warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
 		if (s.length()>0){msg =	msg+s+"超出输入数量,或输入数量为0,请输入正确数量再进行操作";}
 		return Resp.scanSuccess(msg,"成功上架"+num+"件");
 	}
@@ -1871,6 +1877,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		//更新打托方式上的数量
 		updateUpdownTypeNum(updownTypeEntity);
 		String type = trayTypeEntity.getType();
+		//更新货位缓存
+		warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
 		if("3".equals(type)){
 			Integer stockNum = trayTypeEntity.getStockNum();
 			return Resp.scanSuccess("上架成功","整托上架成功"+stockNum+"件");