wms / wms_henanqingyuan · Commits

Commit 2349cb98ccd76eb86f87986b6f5491330ea3d3d5

Authored by 肖超群
1 parent b7871d09

去掉C库区的判断

Inline Side-by-side
Showing 1 changed file with 3 additions and 20 deletions
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
  View file @2349cb9
... ... @@ -262,10 +262,6 @@ public class ReceiptTaskService {
262 262 if (taskDetailList.isEmpty()) {
263 263 throw new ServiceException("任务明细为空");
264 264 }
265   - String containerCode = null;
266   - if(task.getZoneCode().equals("C")) {
267   - containerCode = createContainer();
268   - }
269 265 InventoryHeader inventoryHeader = null;
270 266 if(task.getTaskType().equals(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)) {
271 267 LambdaQueryWrapper<InventoryHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
... ... @@ -309,12 +305,7 @@ public class ReceiptTaskService {
309 305 Location location = locationService.getLocationByCode(task.getToLocation(), warehouseCode);
310 306 inventoryHeader.setZoneCode(location.getZoneCode());
311 307 inventoryHeader.setTotalWeight(task.getWeight());
312   - if(task.getZoneCode().equals("C")) {
313   - inventoryHeader.setContainerCode(containerCode);
314   - inventoryHeader.setUserDef2(task.getContainerCode());
315   - } else {
316   - inventoryHeader.setContainerCode(task.getContainerCode());
317   - }
  308 + inventoryHeader.setContainerCode(task.getContainerCode());
318 309 inventoryHeader.setContainerStatus(QuantityConstant.STATUS_CONTAINER_SOME);
319 310 inventoryHeader.setTotalQty(new BigDecimal(0));
320 311 inventoryHeader.setTotalLines(0);
... ... @@ -365,13 +356,7 @@ public class ReceiptTaskService {
365 356  
366 357 //修改库位状态和对应的容器
367 358 Location location = new Location();
368   - if(task.getZoneCode().equals("C")) {
369   - location.setContainerCode(containerCode);
370   - location.setUserDef2(task.getContainerCode());
371   - containerService.updateLocationCodeAndStatus(containerCode, task.getToLocation(), QuantityConstant.STATUS_CONTAINER_EMPTY);
372   - } else {
373   - location.setContainerCode(task.getContainerCode());
374   - }
  359 + location.setContainerCode(task.getContainerCode());
375 360 location.setWarehouseCode(warehouseCode);
376 361 location.setStatus(QuantityConstant.STATUS_LOCATION_EMPTY);
377 362 LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
... ... @@ -392,9 +377,7 @@ public class ReceiptTaskService {
392 377  
393 378 //修改容器状态和对应的库位
394 379 Container container = new Container();
395   - if(!task.getZoneCode().equals("C")) {
396   - container.setLocationCode(task.getToLocation());
397   - }
  380 + container.setLocationCode(task.getToLocation());
398 381 container.setStatus(QuantityConstant.STATUS_CONTAINER_SOME);
399 382 LambdaUpdateWrapper<Container> containerLambdaUpdateWrapper = Wrappers.lambdaUpdate();
400 383 containerLambdaUpdateWrapper.eq(Container::getCode, task.getContainerCode());
... ...