1.bug修复

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<DistributionStockListEntity> getListByMarketIdAndMaterialName(@RequestParam("marketId") Long marketId, @RequestParam("materialName") String materialName, @RequestParam("warehouseId") Long warehouseId);
+
+
 //	/**
 //     * 修改某个客户信息及物品信息
 //     *

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<DistributionStockListEntity> getListByMarketIdAndMaterialName(Long marketId, String materialName, Long warehouseId) {
+		return distributionStockListService.getListByMarketIdAndMaterialName(marketId,materialName,warehouseId);
+	}
+
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java

@@ -84,4 +84,5 @@ public interface DistributionStockListMapper extends BaseMapper<DistributionStoc
     DistributionStockupStockListInfoVO selectStockListInfoSelf(@Param("reservationId") Long reservationId,@Param("stockListId") Long stockListId);
 
 
+	List<DistributionStockListEntity> getListByMarketIdAndMaterialName(@Param("marketId") Long marketId, @Param("materialName") String materialName, @Param("warehouseId") Long warehouseId);
 }

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}
     </select>
@@ -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}
     </select>
 
+    <select id="getListByMarketIdAndMaterialName" resultType="com.logpm.distribution.entity.DistributionStockListEntity">
+        select ldsl.*
+        from logpm_distribution_stock_list ldsl
+        where ldsl.is_deleted = 0
+          and ldsl.description_goods like concat('%',#{materialName},'%')
+          and ldsl.market_id = #{marketId}
+          and ldsl.warehouse_id = #{warehouseId}
+    </select>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java

@@ -130,6 +130,9 @@ public interface IDistributionStockListService extends BaseService<DistributionS
 	 */
     DistributionStockupStockListInfoVO selectStockListInfoSelf(Long reservationId, Long stockListId);
 
+	List<DistributionStockListEntity> getListByMarketIdAndMaterialName(Long marketId, String materialName, Long warehouseId);
+
+
 //	/**
 //	 * 查询库存品详情
 //	 * @param params

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -781,7 +781,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	@Override
 	public DistributionStockArticleEntity findStockArticleByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {
 		QueryWrapper<DistributionStockArticleEntity> 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<Distrib
 	@Override
 	public List<DistributionStockArticleEntity> findListByWaybillNumberAndWarehouseId(String waybillNumber, Long warehouseId) {
 		QueryWrapper<DistributionStockArticleEntity> 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);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java

@@ -383,6 +383,11 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		return baseMapper.selectStockListInfoSelf(reservationId,stockListId);
 	}
 
+	@Override
+	public List<DistributionStockListEntity> getListByMarketIdAndMaterialName(Long marketId, String materialName, Long warehouseId) {
+		return baseMapper.getListByMarketIdAndMaterialName(marketId,materialName,warehouseId);
+	}
+
 //	@Override
 //	public R selectInventoryDetail(Map<String, Object> params, IPage<Object> page) {
 //		String reservationId = (String) params.get("reservationId");

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){

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){

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;//批次号
 

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}
     </select>
 
@@ -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}
     </select>
 
@@ -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}
     </select>
     <select id="getNumByZation" resultType="java.lang.Integer">

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java

@@ -82,4 +82,7 @@ public interface IWarehouseTrayTypeService extends BaseService<WarehouseTrayType
 	R moveTrayScanPackage(String orderPackageCode,String trayCode,Long warehouseId);
 
 	R moveTrayPackages(List<Long> trayGoodsIds,String trayCode);
+
+	R selectStockByMaterialNameAndMarketId(Long marketId, String materialName, Long warehouseId);
+
 }

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

@@ -673,7 +673,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		IPage<WarehouseTrayTypeVO> warehouseTrayTypeVOIPage = WarehouseTrayTypeWrapper.build().pageVO(pageList);
 		List<WarehouseTrayTypeVO> records = warehouseTrayTypeVOIPage.getRecords();
 		for (WarehouseTrayTypeVO warehouseTrayTypeVO:records){
-			String value = DictBizCache.getValue(DictBizConstant.PALLET_STOCK_TYPE, warehouseTrayTypeVO.getTrayType());
+			String value = DictBizCache.getValue(DictBizConstant.PALLET_ZERO_TYPE, warehouseTrayTypeVO.getTrayType());
 			warehouseTrayTypeVO.setTrayTypeName(value);
 		}
 		warehouseTrayTypeVOIPage.setRecords(records);
@@ -755,7 +755,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			String orderCode = zeroOrderVO.getOrderCode();//订单自编码
 			Long orderId = zeroOrderVO.getOrderId();
 			Integer num = zeroOrderVO.getNum();
-			if(num == 0){
+			if(num == 0 || Objects.isNull(num)){
 				log.warn("#########enterZeroOrderByTrayCode: 请输入正确的数量 orderCode={} num={}",orderCode,num);
 				return R.fail(403,"请输入正确的数量");
 			}
@@ -1951,6 +1951,35 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		return Resp.scanSuccess("移托成功","成功移托"+allNum+"件");
 	}
 
+	@Override
+	public R selectStockByMaterialNameAndMarketId(Long marketId, String materialName, Long warehouseId) {
+		List<StockListVO> ls = new ArrayList<>();
+		//根据商场id和物料编码查询对应的库存品
+		List<DistributionStockListEntity> stockListEntityList = distributionStockListClient.getListByMarketIdAndMaterialName(marketId, materialName,warehouseId);
+		if(Objects.isNull(stockListEntityList) || stockListEntityList.size() == 0){
+			log.warn("################selectStockByMaterialNameAndMarketId: 库存品不存在 marketId={} materialName={}",marketId,materialName);
+			return R.fail(403,"库存品不存在");
+		}
+		for(DistributionStockListEntity stockListEntity:stockListEntityList){
+			StockListVO stockListVO = new StockListVO();
+			BeanUtil.copy(stockListEntity,stockListVO);
+			Integer quantityStock = stockListEntity.getQuantityStock();//在数量
+			String incomingBatch = stockListEntity.getIncomingBatch();
+			String cargoNumber = stockListEntity.getCargoNumber();
+			List<PositionVO> updownGoodsByStock = warehouseUpdownGoodsService.getUpdownGoodsByStock(marketId,cargoNumber,incomingBatch);
+			List<PositionVO> traynGoodsByStock = warehouseTrayGoodsService.getTrayGoodsByStockNoAllocationId(marketId,cargoNumber,incomingBatch);
+			updownGoodsByStock.addAll(traynGoodsByStock);
+			for (PositionVO positionVO:updownGoodsByStock){
+				Integer num = positionVO.getNum();
+				quantityStock = quantityStock - num;
+			}
+			stockListVO.setQuantityStock(quantityStock);
+			stockListVO.setPositionList(updownGoodsByStock);
+			ls.add(stockListVO);
+		}
+		return R.data(ls);
+	}
+
 
 	private R moveTrayOrderPackageCode(WarehouseTrayTypeEntity trayTypeEntity, String orderPackageCode) {
 		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);

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

@@ -1106,7 +1106,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			//1物料编码
 			String materialCode = code;
 			QueryWrapper<WarehouseUpdownGoodsEntity> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("association_value",materialCode)
+			queryWrapper.like("association_value",materialCode)
 				.eq("market_id",marketId);
 			List<WarehouseUpdownGoodsEntity> list = warehouseUpdownGoodsService.list(queryWrapper);
 			return R.data(list);