diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index da4713187..31798547c 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/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())); //真正的处理需要的数据 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java index e6ac98e19..a35b026d7 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java +++ b/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) { - warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString()); - } +// if (r.getCode() == 200) { +// 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) { - warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString()); - } +// if (r.getCode() == 200) { +// 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) { - warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString()); - } +// if (r.getCode() == 200) { +// 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) { - warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString()); - } +// if (r.getCode() == 200) { +// 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)")){ -// log.info("缓存取值>>>>>>>>>>"); -// return R.data(bladeRedis.get(Url+"/locationsnub")); -// } + if (null !=bladeRedis.get(Url+"/locationsnub)")){ + log.info("缓存取值>>>>>>>>>>"); + 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) { - String prefix = Url+"/*"; - bladeRedis.del(bladeRedis.keys(prefix)); - } +// if (r.getCode() == 200) { +// String prefix = Url+"/*"; +// 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) { - String prefix = Url+"/*"; - bladeRedis.del(bladeRedis.keys(prefix)); - } +// if (r.getCode() == 200) { +// String prefix = Url+"/*"; +// 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) { - String prefix = Url+"/*"; - bladeRedis.del(bladeRedis.keys(prefix)); - } +// if (r.getCode() == 200) { +// String prefix = Url+"/*"; +// bladeRedis.del(bladeRedis.keys(prefix)); +// } return r; } catch (CustomerException e) { log.warn(e.message); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 509136b12..b016a85c3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -649,6 +649,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl0){msg = msg+s+"超出输入数量,或输入数量为0,请输入正确数量再进行操作";} return Resp.scanSuccess(msg,"成功上架"+num+"件"); } @@ -1871,6 +1877,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl