diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java index 14c647c0a..4c2436071 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java @@ -109,6 +109,10 @@ public interface IDistributionStockListClient { @GetMapping(API_PREFIX+"/getEntityByMarketIdAndMaterialCodeAndIncomingBatch") DistributionStockListEntity getEntityByMarketIdAndMaterialCodeAndIncomingBatch(@RequestParam("marketId") Long marketId, @RequestParam("materialCode") String materialCode, @RequestParam("incomingBatch") String incomingBatch); + @GetMapping(API_PREFIX+"/getListByMarketIdAndMaterialName") + List getListByMarketIdAndMaterialName(@RequestParam("marketId") Long marketId, @RequestParam("materialName") String materialName, @RequestParam("warehouseId") Long warehouseId); + + // /** // * 修改某个客户信息及物品信息 // * diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java index 2e2ed78d8..8299f6e2a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java @@ -149,5 +149,10 @@ public class DistributionStockListClient implements IDistributionStockListClient return distributionStockListService.getOne(queryWrapper); } + @Override + public List getListByMarketIdAndMaterialName(Long marketId, String materialName, Long warehouseId) { + return distributionStockListService.getListByMarketIdAndMaterialName(marketId,materialName,warehouseId); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java index 9f3da15a0..1adf5ae3e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java @@ -84,4 +84,5 @@ public interface DistributionStockListMapper extends BaseMapper getListByMarketIdAndMaterialName(@Param("marketId") Long marketId, @Param("materialName") String materialName, @Param("warehouseId") Long warehouseId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index f05b18037..d0f08714c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -320,7 +320,7 @@ select ldsl.* from logpm_distribution_stock_list ldsl where ldsl.is_deleted = 0 - and ldsl.cargo_number = #{materialCode} + and ldsl.cargo_number like concat('%',#{materialCode},'%') and ldsl.market_id = #{marketId} and ldsl.warehouse_id = #{warehouseId} @@ -329,9 +329,18 @@ select ldsl.* from logpm_distribution_stock_list ldsl where ldsl.is_deleted = 0 - and ldsl.description_goods = #{materialName} + and ldsl.description_goods like concat('%',#{materialName},'%') and ldsl.market_id = #{marketId} and ldsl.warehouse_id = #{warehouseId} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java index de1503028..d4226fef0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java @@ -130,6 +130,9 @@ public interface IDistributionStockListService extends BaseService getListByMarketIdAndMaterialName(Long marketId, String materialName, Long warehouseId); + + // /** // * 查询库存品详情 // * @param params diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 2ca99814a..108bab274 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -781,7 +781,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("order_code",orderCode) + queryWrapper.like("order_code",orderCode) .eq("warehouse_id",warehouseId) .eq("is_zero",1) .eq("is_deleted",0); @@ -791,7 +791,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl findListByWaybillNumberAndWarehouseId(String waybillNumber, Long warehouseId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("waybill_number",waybillNumber) + queryWrapper.like("waybill_number",waybillNumber) .eq("warehouse_id",warehouseId) .eq("is_zero",1) .eq("is_deleted",0); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java index 84f27d9b9..b89dfeb48 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java @@ -383,6 +383,11 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl getListByMarketIdAndMaterialName(Long marketId, String materialName, Long warehouseId) { + return baseMapper.getListByMarketIdAndMaterialName(marketId,materialName,warehouseId); + } + // @Override // public R selectInventoryDetail(Map params, IPage page) { // String reservationId = (String) params.get("reservationId"); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java index 2ba459f8a..1825d8017 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java @@ -793,6 +793,42 @@ public class WarehouseTrayTypeApiController { } } + @ResponseBody + @PostMapping("/selectStockByMaterialNameAndMarketId") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询库存品", notes = "传入trayTypeDTO") + public R selectStockByMaterialNameAndMarketId(@RequestBody TrayTypeDTO trayTypeDTO) { + String method = "###########selectStockByMaterialNameAndMarketId: "; + log.info(method + "查询库存品 trayTypeDTO={}", trayTypeDTO); + Long marketId = trayTypeDTO.getMarketId(); +// String materialCode = trayTypeDTO.getMaterialCode(); + String materialName = trayTypeDTO.getMaterialName(); + try{ + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息不能为空"); + return R.fail(403,"仓库信息不能为空"); + } + + + if(Objects.isNull(marketId)){ + log.warn(method+"商场id不能为空 marketId={}",marketId); + return R.fail(403,"商场id不能为空"); + } + if(!StringUtil.hasLength(materialName)){ + log.warn(method+"物料名称不能为空 materialCode={}",materialName); + return R.fail(403,"物料名称不能为空"); + } + return warehouseTrayTypeService.selectStockByMaterialNameAndMarketId(marketId,materialName,myCurrentWarehouse.getId()); + }catch (CustomerException e){ + log.warn(e.message); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常，联系管理员",e); + return R.fail(500,"系统异常，联系管理员"); + } + } + @ResponseBody @PostMapping("/enterStockNoDataMaterialCode") @@ -834,6 +870,10 @@ public class WarehouseTrayTypeApiController { log.warn(method+"商场id不能为空 marketId={}",marketId); return R.fail(403,"商场id不能为空"); } + if(Objects.isNull(num)||num == 0){ + log.warn(method+"数量不正确 num={}",num); + return R.fail(403,"数量不正确"); + } return warehouseTrayTypeService.enterStockNoDataMaterialCode(trayCode,trayType,materialCode,marketId,num,incomingBatch,myCurrentWarehouse.getId()); }catch (CustomerException e){ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java index 6c7b85cd6..15da3f385 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java @@ -304,6 +304,14 @@ public class WarehouseUpdownTypeApiController { log.warn(method+"没有处理的数据"); return R.fail(403,"无处理数据"); } + for (UpShelfZeroOrderDTO dto:upShelfZeroOrderList){ + Integer enterNum = dto.getEnterNum(); + if(Objects.isNull(enterNum) || enterNum == 0){ + log.warn(method+"请输入正确的数量"); + return R.fail(403,"请输入正确的数量"); + } + } + if(Objects.isNull(allocationId)){ log.warn(method+"库位信息不能为空 allocationId={}",allocationId); return R.fail(403,"库位信息不能为空"); @@ -384,6 +392,15 @@ public class WarehouseUpdownTypeApiController { log.warn(method+"没有处理的数据"); return R.fail(403,"无处理数据"); } + + for (UpShelfStockDTO dto:upShelfStockList){ + Integer enterNum = dto.getEnterNum(); + if(Objects.isNull(enterNum) || enterNum == 0){ + log.warn(method+"请输入正确的数量"); + return R.fail(403,"请输入正确的数量"); + } + } + if(Objects.isNull(allocationId)){ log.warn(method+"库位信息不能为空 allocationId={}",allocationId); return R.fail(403,"库位信息不能为空"); @@ -511,6 +528,14 @@ public class WarehouseUpdownTypeApiController { log.warn(method+"没有处理的数据"); return R.fail(403,"无处理数据"); } + for (UpShelfZeroOrderDTO dto:upShelfZeroOrderList){ + Integer enterNum = dto.getEnterNum(); + if(Objects.isNull(enterNum) || enterNum == 0){ + log.warn(method+"请输入正确的数量"); + return R.fail(403,"请输入正确的数量"); + } + } + //查询该库位的货物信息 return warehouseUpdownTypeService.downZeroOrder(upShelfZeroOrderList); }catch (CustomerException e){ @@ -577,6 +602,15 @@ public class WarehouseUpdownTypeApiController { log.warn(method+"没有处理的数据"); return R.fail(403,"无处理数据"); } + + for (UpShelfStockDTO dto:upShelfStockList){ + Integer enterNum = dto.getEnterNum(); + if(Objects.isNull(enterNum) || enterNum == 0){ + log.warn(method+"请输入正确的数量"); + return R.fail(403,"请输入正确的数量"); + } + } + //查询该库位的货物信息 return warehouseUpdownTypeService.downStock(upShelfStockList); }catch (CustomerException e){ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TrayTypeDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TrayTypeDTO.java index bcad31b09..f431b3ed5 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TrayTypeDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TrayTypeDTO.java @@ -44,6 +44,7 @@ public class TrayTypeDTO implements Serializable { private String warehouseCode;//仓库编码 private String materialCode;//物料编码 + private String materialName;//物料名称 private Long marketId;//商场id private String incomingBatch;//批次号 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml index 0103f6792..2c7d0e9e9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml @@ -235,7 +235,7 @@ select lwug.* from logpm_warehouse_updown_goods lwug left join logpm_distribution_stock_list ldsl on ldsl.market_id = lwug.market_id and ldsl.incoming_batch = lwug.incoming_batch and ldsl.material_id = lwug.association_id and lwug.is_deleted = 0 - where ldsl.description_goods = #{materialName} + where ldsl.description_goods like concat('%',#{materialName},'%') and ldsl.market_id = #{marketId} @@ -244,7 +244,7 @@ ldsa.waybill_number waybillNumber from logpm_warehouse_updown_goods lwug left join logpm_distribution_stock_article ldsa on ldsa.order_code = lwug.association_value and ldsa.is_deleted = 0 - where lwug.association_value = #{orderCode} + where lwug.association_value like concat('%',#{orderCode},'%') and ldsa.warehouse_id = #{warehouseId} @@ -253,7 +253,7 @@ ldsa.waybill_number waybillNumber from logpm_warehouse_updown_goods lwug left join logpm_distribution_stock_article ldsa on ldsa.order_code = lwug.association_value and ldsa.is_deleted = 0 - where ldsa.waybill_number = #{waybillNumber} + where ldsa.waybill_number like concat('%',#{waybillNumber},'%') and ldsa.warehouse_id = #{warehouseId}