增加更新状态的条件

肖超群
1 parent 1b3d98ac
Showing 5 changed files with 60 additions and 21 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -525,4 +525,11 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         return success;
     }
  
+    @Override
+    public boolean updateById(ReceiptContainerHeader receiptContainerHeader) {
+        LambdaQueryWrapper<ReceiptContainerHeader> receiptContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+        receiptContainerHeaderLambdaQueryWrapper.eq(ReceiptContainerHeader::getId, receiptContainerHeader.getId()).lt(receiptContainerHeader.getStatus() != null,
+            ReceiptContainerHeader::getStatus, QuantityConstant.RECEIPT_CONTAINER_FINISHED);
+        return super.update(receiptContainerHeader, receiptContainerHeaderLambdaQueryWrapper);
+    }
 }
@@ -313,4 +313,12 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
         return receiptHeader;
     }
  
+    @Override
+    public boolean updateById(ReceiptHeader receiptHeader) {
+        LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+        receiptHeaderLambdaQueryWrapper.eq(ReceiptHeader::getId, receiptHeader.getId())
+            .lt(receiptHeader.getFirstStatus() != null, ReceiptHeader::getFirstStatus, QuantityConstant.RECEIPT_HEADER_RETURN)
+            .lt(receiptHeader.getLastStatus() != null, ReceiptHeader::getLastStatus, QuantityConstant.RECEIPT_HEADER_RETURN);
+        return super.update(receiptHeader, receiptHeaderLambdaQueryWrapper);
+    }
 }
@@ -308,4 +308,11 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         return shipmentContainerHeader;
     }
  
+    @Override
+    public boolean updateById(ShipmentContainerHeader shipmentContainerHeader) {
+        LambdaQueryWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+        shipmentContainerHeaderLambdaQueryWrapper.eq(ShipmentContainerHeader::getId, shipmentContainerHeader.getId()).lt(shipmentContainerHeader.getStatus() != null,
+            ShipmentContainerHeader::getStatus, QuantityConstant.SHIPMENT_CONTAINER_FINISHED);
+        return super.update(shipmentContainerHeader, shipmentContainerHeaderLambdaQueryWrapper);
+    }
 }
@@ -538,4 +538,13 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
         }
         return Result.OK("自动预配盘出库成功");
     }
+
+    @Override
+    public boolean updateById(ShipmentHeader shipmentHeader) {
+        LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+        shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getId, shipmentHeader.getId())
+            .lt(shipmentHeader.getFirstStatus() != null, ShipmentHeader::getFirstStatus, QuantityConstant.SHIPMENT_HEADER_RETURN)
+            .lt(shipmentHeader.getLastStatus() != null, ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_RETURN);
+        return super.update(shipmentHeader, shipmentHeaderLambdaQueryWrapper);
+    }
 }
@@ -321,9 +321,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             return Result.error("创建出库查看任务时，容器编码为空");
         }
  
-        //创建出库查看任务时，库存不能被冻结
+        // 创建出库查看任务时，库存不能被冻结
         LambdaQueryWrapper<InventoryDetail> inventoryDetailWrapper = Wrappers.lambdaQuery();
-        inventoryDetailWrapper.eq(InventoryDetail::getContainerCode,containerCode);
+        inventoryDetailWrapper.eq(InventoryDetail::getContainerCode, containerCode);
         List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailWrapper);
         if (StringUtils.isEmpty(inventoryDetailList)) {
             return Result.error("创建出库查看任务时，库存详情为空");
@@ -458,25 +458,25 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 return Result.error("没有正常状态的库存详情");
             }
             for (InventoryDetail inventoryDetail : inventoryDetailList) {
-                 if (inventoryDetail.getEnable() == QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE) {
-                     TaskDetail taskDetail = new TaskDetail();
-                     taskDetail.setTaskHeaderId(taskHeader.getId());
-                     taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY);
-                     taskDetail.setWarehouseCode(warehouseCode);
-                     taskDetail.setCompanyCode(inventoryDetail.getCompanyCode());
-                     taskDetail.setMaterialCode(inventoryDetail.getMaterialCode());
-                     taskDetail.setMaterialName(inventoryDetail.getMaterialName());
-                     taskDetail.setMaterialSpec(inventoryDetail.getMaterialSpec());
-                     taskDetail.setMaterialUnit(inventoryDetail.getMaterialUnit());
-                     taskDetail.setFromInventoryDetailId(inventoryDetail.getId());
-                     taskDetail.setInventoryStatus(inventoryDetail.getInventoryStatus());
-                     taskDetail.setQty(inventoryDetail.getQty());
-                     taskDetail.setBatch(inventoryDetail.getBatch());
-                     taskDetail.setLot(inventoryDetail.getLot());
-                     taskDetail.setProject(inventoryDetail.getProject());
-                     taskDetail.setReceiveTime(inventoryDetail.getReceiveTime());
-                     taskDetailList.add(taskDetail);
-                 }
+                if (inventoryDetail.getEnable() == QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE) {
+                    TaskDetail taskDetail = new TaskDetail();
+                    taskDetail.setTaskHeaderId(taskHeader.getId());
+                    taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY);
+                    taskDetail.setWarehouseCode(warehouseCode);
+                    taskDetail.setCompanyCode(inventoryDetail.getCompanyCode());
+                    taskDetail.setMaterialCode(inventoryDetail.getMaterialCode());
+                    taskDetail.setMaterialName(inventoryDetail.getMaterialName());
+                    taskDetail.setMaterialSpec(inventoryDetail.getMaterialSpec());
+                    taskDetail.setMaterialUnit(inventoryDetail.getMaterialUnit());
+                    taskDetail.setFromInventoryDetailId(inventoryDetail.getId());
+                    taskDetail.setInventoryStatus(inventoryDetail.getInventoryStatus());
+                    taskDetail.setQty(inventoryDetail.getQty());
+                    taskDetail.setBatch(inventoryDetail.getBatch());
+                    taskDetail.setLot(inventoryDetail.getLot());
+                    taskDetail.setProject(inventoryDetail.getProject());
+                    taskDetail.setReceiveTime(inventoryDetail.getReceiveTime());
+                    taskDetailList.add(taskDetail);
+                }
             }
             success = taskDetailService.saveBatch(taskDetailList);
             if (!success) {
@@ -3288,4 +3288,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         }
         return Result.ok("取消任务成功");
     }
+
+    @Override
+    public boolean updateById(TaskHeader taskHeader) {
+        LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+        taskHeaderLambdaQueryWrapper.eq(TaskHeader::getId, taskHeader.getId()).lt(taskHeader.getStatus() != null, TaskHeader::getStatus,
+            QuantityConstant.TASK_STATUS_COMPLETED);
+        return super.update(taskHeader, taskHeaderLambdaQueryWrapper);
+    }
 }