修改备货查询

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -502,7 +502,7 @@ public class DistributionStockupAppController extends BladeController {
 		return R.fail(3002, "类型不匹配！！");
 	}
 
-	;
+
 
 	@PostMapping("/getStockupArea")
 	@ApiOperation(value = "查询可修改备货区")
@@ -815,6 +815,9 @@ public class DistributionStockupAppController extends BladeController {
 						//"没有待绑定的库存品信息！"
 						String audioValue9 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.meiyou.getValue());
 						return Resp.scanFail(PdaAudioLingoStatus.meiyou.getName(), audioValue9);
+					case 10:
+						//"没有待绑定的库存品信息！"
+						return Resp.scanFail("该包件与备货物料不匹配！", "该包件与备货物料不匹配！");
 				}
 
 

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

@@ -1932,7 +1932,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		if(ObjectUtils.isNotNull(one) && one.getCodeStatus().equals("1")){
 			return 8;
 		}
-		//查询仓库信息
+		//查询仓库信息 库存品信息
 		DistributionStockListEntity byId = distributionStockListService.getById(stockupDTO.getStockListId());
 		//有 绑定 查询有没有库存品信息
 		List<DisStockListDetailEntity> list1 = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
@@ -1941,22 +1941,36 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			.eq(DisStockListDetailEntity::getWarehouseId, byId.getWarehouseId())
 			.isNull(DisStockListDetailEntity::getStockPackageCode)
 		);
-		if (!list1.isEmpty()) {
+		if (list1.isEmpty()){
+			//没有包件信息
+			return 9;
+		}
+		//判读是否原有包条码
 			switch (stockupDTO.getStockPrint()) {
 				case 1:
-					//查询包件码有没有操作
+					//查询原有的包件码有没有操作
 					List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 						.eq(DistributionParcelListEntity::getOrderPackageCode, stockupDTO.getPacketBarCode())
 						.eq(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.daibeihuo.getValue())
+						.eq(DistributionParcelListEntity::getWarehouseId, byId.getWarehouseId())
 					);
 					if(list.isEmpty()){
 						return 7;
 					}
+					//查询包件信息与库存品选择物料是否一样
+					if(!byId.getMaterialId().equals(list.get(0).getMaterialId())){
+						//不一样
+						return 10;
+					}
+
 					//绑定码
 					disStockListDetail.setStockPackageCode(stockupDTO.getPacketBarCode());
 					disStockListDetail.setId(list1.get(0).getId());
 					break;
-				case 2: //查询有没有生成的数据
+				case 2:
+					//生成的扫描的包条码
+
+					//查询有没有生成的数据
 					DisStockOrdercodeRecoEntity one1 = disStockOrdercodeRecoService.getOne(Wrappers.<DisStockOrdercodeRecoEntity>query().lambda()
 						.eq(DisStockOrdercodeRecoEntity::getCode, stockupDTO.getPacketBarCode())
 						.eq(DisStockOrdercodeRecoEntity::getCodeStatus, "0")
@@ -1976,15 +1990,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 						return 7;
 					}
 			}
-
 			disStockListDetailService.updateById(disStockListDetail); //补充扫码数据
 			return 1;
 
-		} else {
-			//没有包件信息
-			return 9;
-		}
-
 
 	}
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml

@@ -60,9 +60,9 @@
         from logpm_distribution_parcel_list ldpl
         left join logpm_warehouse_tray_goods lwtg on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3
         left join logpm_warehouse_updown_goods lwug on ldpl.order_package_code = lwug.association_value and lwug.association_type = 3
-        where lwug.association_type = 3
-        and lwug.warehouse_id = #{param.warehouseId}
-        and ldpl.warehouse_id = #{param.warehouseId}
+        where
+
+        ldpl.warehouse_id = #{param.warehouseId}
         and ldpl.order_package_code = #{param.orderPackageCode}
         <if test="param.marketNames != null">
             and ldpl.dealer_name in

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.warehouse.service.impl;
 
+import cn.hutool.log.Log;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -308,6 +309,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		//先判定盘点任务是否已结束
 		//当前登录人选择的仓库
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if(ObjectUtils.isNull(myCurrentWarehouse)){
+			return Resp.scanFail("请选择仓库！","请选择仓库！");
+		}
 		verifyTask(taskSearchDTO.getTaskId(),myCurrentWarehouse.getId());
 
 
@@ -334,12 +338,15 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				int taskInventory = getTaskInventory(taskSearchDTO.getTaskId(), collect.get(0), trayByTrayCode);
 				switch (taskInventory){
 					case 0:
-						return Resp.scanFail("没有盘点信息！","没有盘点信息！");
+						log.debug("全仓盘点");
+						//返回托盘信息
+						return getTrayInfo(trayByTrayCode.getId(),myCurrentWarehouse.getId(),trayByTrayCode.getPalletCode());
 					case 1:
 						List<QuestDetailEntity> questDetailList = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId());
 						return R.data(getTaskTrayInfo(questDetailList));
 					case 2:
-						return Resp.scanFail("托盘信息未找到！","托盘信息未找到！");
+						//返回托盘信息
+						return getTrayInfo(trayByTrayCode.getId(),myCurrentWarehouse.getId(),trayByTrayCode.getPalletCode());
 					case 3:
 						return Resp.scanFail("无包件信息！","无包件信息！");
 					default:
@@ -359,6 +366,40 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	}
 
+	//查询托盘信息
+	public R getTrayInfo(Long trayId,Long warehouseId, String taryCode){
+		//返回托盘信息
+		List<TaskTrayVO> trayVO = new ArrayList<>();
+		WarehouseTrayTypeEntity one = trayTypeService.getOne(Wrappers.<WarehouseTrayTypeEntity>query().lambda()
+			.eq(WarehouseTrayTypeEntity::getTrayId, trayId)
+			.eq(WarehouseTrayTypeEntity::getIsDeleted, 0)
+		);
+		TaskTrayVO taskTrayVO = new TaskTrayVO();
+		if(ObjectUtils.isNotNull(one)){
+			//判断是否在同一个仓库
+			if(one.getWarehouseId().equals(warehouseId)){
+				//是
+				taskTrayVO.setTrayId(trayId);
+				taskTrayVO.setTrayCode(taryCode);
+				taskTrayVO.setTotal(0);
+				taskTrayVO.setUnTotal(0);
+				taskTrayVO.setGoodsType(one.getType()); // 没有类型
+			}else{
+				//不是
+				return Resp.scanFail("此托盘不在当前仓库！","此托盘不在当前仓库！");
+			}
+		}else{
+			//没有绑定可以使用
+			taskTrayVO.setTrayId(trayId);
+			taskTrayVO.setTrayCode(taryCode);
+			taskTrayVO.setTotal(0);
+			taskTrayVO.setUnTotal(0);
+			taskTrayVO.setGoodsType("定制品"); // 定制品
+		}
+		trayVO.add(taskTrayVO);
+		return R.data(trayVO);
+	}
+
 
 	/**
 	 * 出来托盘信息
@@ -631,6 +672,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			}
 		}else{
 			log.debug("托盘盘点：没有当前盘点任务！");
+
+
+
+
 			return 0;
 		}