1

src/main/java/com/wms/bussiness/JobComponent.java

@@ -78,7 +78,7 @@ public class JobComponent extends BaseController {
     private final VehicleMapper vehicleMapper;
 
 
-    @Scheduled(fixedDelay = 1000)
+    @Scheduled(fixedDelay = 2000)
     public void sendTasksToWcs() {
         try {
             // 查找待下发的任务
@@ -94,14 +94,14 @@ public class JobComponent extends BaseController {
                     sendTasksInToWcs(task);
                     return;
                 }
+                if(task.getTaskType().equals(TaskType.MOVE.getCode())){
+                    sendTasksMoveToWcs(task);
+                    return;
+                }
                 if(task.getTaskType().equals(TaskType.OUT.getCode()) || task.getTaskType().equals(TaskType.INVENTORY.getCode())){
                     sendTasksOutToWcs(task);
                     return;
                 }
-                if(task.getTaskType().equals(TaskType.MOVE.getCode())){
-                    sendTasksMoveToWcs(task);
-//                    return;
-                }
             }
         }catch (Exception exception){
             logger.error("定时器下发任务发生异常：{}", exception.toString());

src/main/java/com/wms/bussiness/TaskOperation.java

@@ -145,7 +145,7 @@ public class TaskOperation {
                 addStock.setProviderId("");
                 addStock.setProviderName("");
                 addStock.setExpirationDate(null);
-                addStock.setStockStatus(0);
+                addStock.setStockStatus(StockStatus.OK.getCode());
                 addStock.setGoodsStatus(null);
                 addStock.setCreateTime(new Date());
                 addStock.setLastUpdateTime(null);

src/main/java/com/wms/service/serviceImplements/OrderInImplement.java

@@ -31,6 +31,7 @@ public class OrderInImplement implements IOrderInService {
 
     /**
      * 查询入库单
+     *
      * @param request 查询参数
      * @return 返回结果
      */
@@ -43,9 +44,9 @@ public class OrderInImplement implements IOrderInService {
     }
 
 
-
     /**
      * 添加入库单
+     *
      * @param request 入库单参数
      * @return 返回结果
      */
@@ -69,7 +70,7 @@ public class OrderInImplement implements IOrderInService {
             //appOrderIn.setProductionDate(request.abcSelect);
             appOrderInMapper.insert(appOrderIn);
             return new WmsApiResponse<>(0, "添加成功", appOrderIn);
-        }else{
+        }
         AppOrderIn selectOrderIn = new AppOrderIn();
         selectOrderIn.setRemark("带物料托盘入库");
         selectOrderIn.setVehicleNo(request.vehicleNo);
@@ -89,11 +90,7 @@ public class OrderInImplement implements IOrderInService {
             appOrderIn.setGoodsId(request.goodsId);
             appOrderIn.setGoodsNum(BigDecimal.valueOf(request.goodsNum));
             appOrderIn.setWareHouse(request.abcSelect);
-                if (Objects.equals(request.efSelect, "E")){
+            appOrderIn.setOrderStatus(OrderInStatusEnum.CREATE.getCode());
-                    appOrderIn.setOrderStatus(0);
-                }else {
-                    appOrderIn.setOrderStatus(2);
-                }
             appOrderIn.setCreateTime(LocalDateTime.now());
             appOrderIn.setCreatePerson("WMS");
             appOrderIn.setUpdateTime(LocalDateTime.now());
@@ -101,13 +98,13 @@ public class OrderInImplement implements IOrderInService {
             appOrderInMapper.insert(appOrderIn);
             return new WmsApiResponse<>(0, "添加成功", appOrderIn);
         } else {
-                return new WmsApiResponse<>(1, "必须先删除带物料托盘入库任务！", null);
+            return new WmsApiResponse<>(1, "当前托盘已有任务！", null);
-            }
         }
     }
 
     /**
      * 修改数量
+     *
      * @param request 修改数量参数
      * @return 返回结果
      */
@@ -133,6 +130,7 @@ public class OrderInImplement implements IOrderInService {
 
     /**
      * 绑定载具
+     *
      * @param request 绑定参数
      * @return 返回结果
      */
@@ -221,10 +219,9 @@ public class OrderInImplement implements IOrderInService {
     }
 
 
-
-
     /**
      * 根据载具号查询入库单
+     *
      * @param vehicleNo 载具号
      * @return 返回结果
      */
@@ -244,6 +241,7 @@ public class OrderInImplement implements IOrderInService {
 
     /**
      * 解绑载具
+     *
      * @param rowId 入库单行号
      * @return 返回结果
      */
@@ -276,7 +274,8 @@ public class OrderInImplement implements IOrderInService {
                 return new WmsApiResponse<>(0, "删除成功", true);
             } else {
                 return new WmsApiResponse<>(1, "订单不存在", false);
-            }        } catch (Exception e) {
+            }
+        } catch (Exception e) {
             // 记录异常
             return new WmsApiResponse<>(1, "删除失败", false);
         }

src/main/java/com/wms/service/serviceImplements/parent/ContainerImplement.java

@@ -84,7 +84,6 @@ public class ContainerImplement implements ContainerService {
      * @param request 请求信息
      * @return 响应信息
      */
-
     @Override
     @Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED)
     public CreateInstoreTaskResponse createInstoreTask(CreateInstoreTaskRequest request) {
@@ -156,13 +155,14 @@ public class ContainerImplement implements ContainerService {
             success.setPalletNo(virtualPalletId);
             success.setFromCellNo(request.getFromCellNo());
             success.setToCellNo(useLocation.getLocationId());
-        }else {
+            return success;
+        }
         // 查询待入库的批次号
         AppOrderIn waitInStockQuery = new AppOrderIn();
         waitInStockQuery.setVehicleNo(request.getPalletNo());
         List<AppOrderIn> waitInStockList = appOrderInMapper.select(waitInStockQuery); // 查找待入库的批次号
         if(waitInStockList.isEmpty()) {
-                log.error("条码：{} 不存在待入库的任务", request.getPalletNo());
+            log.error("托盘：{} 不存在待入库的任务", request.getPalletNo());
             return new CreateInstoreTaskResponse("400", String.format("条码：%s 不存在待入库的任务", request.getPalletNo()));
         }
         AppOrderIn appOrderIn = waitInStockList.get(0);
@@ -175,7 +175,6 @@ public class ContainerImplement implements ContainerService {
         if (WmsConstants.LOW_FLOOR.equals(request.getHeight())) {
             canUseLocations = canUseLocations.stream().filter(l ->  l.getLayer() == 1).toList();
         }
-
         if (WmsConstants.HIGH_FLOOR.equals(request.getHeight())) {
             canUseLocations = canUseLocations.stream().filter(l -> l.getLayer() != 1).toList();
         }
@@ -200,7 +199,7 @@ public class ContainerImplement implements ContainerService {
         }
         newInTask.setWeight(Double.valueOf(request.getWeight()));
         newInTask.setCreateTime(new java.util.Date());
-            newInTask.setUserName("四向车API");
+        newInTask.setUserName("四向车请求");
         newInTask.setVehicleSize(Integer.valueOf(request.getHeight()));
         newInTask.setVehicleNo(request.getPalletNo());
         newInTask.setTaskPriority(1);
@@ -231,7 +230,6 @@ public class ContainerImplement implements ContainerService {
         success.setPalletNo(request.getPalletNo());
         success.setFromCellNo(request.getFromCellNo());
         success.setToCellNo(useLocation.getLocationId());
-        }
         return success;
     }