1.修复库内作业bug

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

@@ -16,6 +16,8 @@ public interface IWarehouseTrayTypeService extends BaseService<WarehouseTrayType
 
     TrayTypeDataVO getEntityByTrayCode(String trayCode);
 
+	TrayTypeDataVO getEntityByTrayCodeWithUpdown(String trayCode);
+
 	R orderScanOrderPackageCode(String trayType, String trayCode, String orderPackageCode);
 
 	R deleteScanOrderPackageCode(String trayCode, List<String> orderPackageCodes);

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

@@ -164,6 +164,74 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		return trayTypeDataVO;
 	}
 
+	@Override
+	public TrayTypeDataVO getEntityByTrayCodeWithUpdown(String trayCode) {
+		BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
+		Integer disableType = basicdataTrayEntity.getDisableType();
+		if(disableType == 2){
+			log.warn("###############getEntityByTrayCode: 该托盘已被禁用 trayCode={}",trayCode);
+			throw new CustomerException(403,"该托盘已被禁用");
+		}
+		Long trayId = basicdataTrayEntity.getId();
+		Long allocationId = warehouseTaryAllocationService.getAllocationIdByTrayId(trayId);
+		if(Objects.isNull(allocationId)){
+			log.warn("###############getEntityByTrayCode: 托盘未上架 allocationId={}",allocationId);
+			throw new CustomerException(403,"托盘未上架");
+		}
+
+		//根据托盘编码查询是否有托盘编码存在打托数据
+		QueryWrapper<WarehouseTrayTypeEntity> queryTrayTypeWrapper = new QueryWrapper<>();
+		queryTrayTypeWrapper.eq("tray_code",trayCode)
+			.eq("is_deleted",0);
+		WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryTrayTypeWrapper);
+		if(Objects.isNull(trayTypeEntity)){
+			//没有查询到托盘打托信息
+			return null;
+		}
+		String type = trayTypeEntity.getType();//类型 1扫码分拣（订制品）  2人工分拣（零担） 3库存品
+		Long trayTypeId = trayTypeEntity.getId();//打托方式id
+		String trayType = trayTypeEntity.getTrayType();
+
+		TrayTypeDataVO trayTypeDataVO = new TrayTypeDataVO();
+		trayTypeDataVO.setTrayTypeId(trayTypeId);
+		trayTypeDataVO.setType(type);
+		trayTypeDataVO.setTrayCode(trayTypeEntity.getTrayCode());
+		trayTypeDataVO.setTrayNum(trayTypeEntity.getTotalNum());
+		trayTypeDataVO.setName(trayTypeEntity.getFilterValue());
+		trayTypeDataVO.setOrderTotalNum(trayTypeEntity.getOrderTotalNum());
+		trayTypeDataVO.setTrayType(trayType);
+		trayTypeDataVO.setMarketId(trayTypeEntity.getMarketId());
+		trayTypeDataVO.setMarketName(trayTypeEntity.getMarketName());
+		trayTypeDataVO.setReamrk(trayTypeEntity.getRemark());
+
+		if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){//订制品打托
+			String trayTypeName = DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, trayTypeEntity.getTrayType());
+			trayTypeDataVO.setTrayTypeName(trayTypeName);
+			List<TrayTypeDataListVO> list = warehouseTrayGoodsService.getListByTrayTypeId(trayTypeId);
+			trayTypeDataVO.setList(list);
+		}else if(PalletProductTypeConstant.ARTIFICIAL.equals(type)){
+			String trayTypeName = DictBizCache.getValue(DictBizConstant.PALLET_ZERO_TYPE, trayTypeEntity.getTrayType());
+			trayTypeDataVO.setTrayTypeName(trayTypeName);
+			List<TrayTypeDataListVO> list = warehouseTrayGoodsService.getZeroListByTrayTypeId(trayTypeId);
+			trayTypeDataVO.setList(list);
+		}else if(PalletProductTypeConstant.STOCKDATA.equals(type)){
+			String trayTypeName = DictBizCache.getValue(DictBizConstant.PALLET_STOCK_TYPE, trayTypeEntity.getTrayType());
+			trayTypeDataVO.setTrayTypeName(trayTypeName);
+			List<TrayTypeDataListVO> list = warehouseTrayGoodsService.getStockListByTrayTypeId(trayTypeId);
+			trayTypeDataVO.setList(list);
+		}else if(PalletProductTypeConstant.STOCKNODATA.equals(type)){
+			String trayTypeName = DictBizCache.getValue(DictBizConstant.PALLET_STOCKNODATA_TYPE, trayTypeEntity.getTrayType());
+			trayTypeDataVO.setTrayTypeName(trayTypeName);
+			List<TrayTypeDataListVO> list = warehouseTrayGoodsService.getStockListByTrayTypeId(trayTypeId);
+			trayTypeDataVO.setList(list);
+		}else {
+			log.warn("##################getEntityByTrayCode: 未知的打托类型");
+		}
+		return trayTypeDataVO;
+	}
+
+
+
 //	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public R orderScanOrderPackageCode(String trayType, String trayCode, String orderPackageCode) {

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

@@ -386,7 +386,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		if(!Objects.isNull(trayEntity)){
 			trayCode = trayEntity.getPalletCode();
 			//如果有托盘
-			TrayTypeDataVO entityByTrayCode = warehouseTrayTypeService.getEntityByTrayCode(trayCode);
+			TrayTypeDataVO entityByTrayCode = warehouseTrayTypeService.getEntityByTrayCodeWithUpdown(trayCode);
 			trayType = entityByTrayCode.getTrayType();
 			String type = entityByTrayCode.getType();//数据类型 1订制品 2零担 3 4 库存品
 			if(!"1".equals(type)){
@@ -621,7 +621,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		if(!Objects.isNull(trayEntity)){
 			trayCode = trayEntity.getPalletCode();
 			//如果有托盘
-			TrayTypeDataVO entityByTrayCode = warehouseTrayTypeService.getEntityByTrayCode(trayCode);
+			TrayTypeDataVO entityByTrayCode = warehouseTrayTypeService.getEntityByTrayCodeWithUpdown(trayCode);
 			trayType = entityByTrayCode.getTrayType();
 			String type = entityByTrayCode.getType();//数据类型 1订制品 2零担 3 4 库存品
 			if(!"2".equals(type)){
@@ -749,7 +749,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		if(!Objects.isNull(trayEntity)){
 			trayCode = trayEntity.getPalletCode();
 			//如果有托盘
-			TrayTypeDataVO entityByTrayCode = warehouseTrayTypeService.getEntityByTrayCode(trayCode);
+			TrayTypeDataVO entityByTrayCode = warehouseTrayTypeService.getEntityByTrayCodeWithUpdown(trayCode);
 			trayType = entityByTrayCode.getTrayType();
 			String type = entityByTrayCode.getType();//数据类型 1订制品 2零担 3 4 库存品
 			if(!"3".equals(type) && !"4".equals(type) ){
@@ -947,7 +947,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			}else{
 				if(!Objects.isNull(trayEntity)){
 					//绑定了托盘
-					warehouseTrayTypeService.updateEntityNumByOrderCodeAndTrayCode(orderCode,trayEntity.getPalletCode(),enterNum);
+					warehouseTrayTypeService.updateEntityNumByOrderCodeAndTrayCode(orderCode,trayEntity.getPalletCode(),num-enterNum);
 				}
 
 				int residue = num - enterNum;
@@ -1284,12 +1284,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 	public R downScanTrayCode(String trayCode) {
 		BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);//托盘信息
 		if(Objects.isNull(trayEntity)){
-			log.warn("#################findUpShelfScanGoods: 托盘信息不存在 trayCode={}",trayCode);
+			log.warn("#################downScanTrayCode: 托盘信息不存在 trayCode={}",trayCode);
 			throw new CustomerException(403,"托盘信息不存在");
 		}
 		Long allocationId = warehouseTaryAllocationService.getAllocationIdByTrayId(trayEntity.getId());
 		if (Objects.isNull(allocationId)){
-			log.warn("#################findUpShelfScanGoods: 托盘未上架 trayCode={}",trayCode);
+			log.warn("#################downScanTrayCode: 托盘未上架 trayCode={}",trayCode);
 			throw new CustomerException(403,"托盘未上架");
 		}
 
@@ -1390,7 +1390,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			}
 
 		}
-		warehouseUpdownGoodsService.saveBatch(updownGoodsList);
+		warehouseUpdownGoodsService.saveOrUpdateBatch(updownGoodsList);
 
 		saveUpdownGoodsLog(updownGoodsLogList,"1",0,"扫描上架:库存品上架");
 		return stringBuffer.toString();