From eec010ca764a84ede80299046bb28928d0f62c4d Mon Sep 17 00:00:00 2001
From: Huluwa22 <2667400744@qq.com>
Date: Fri, 21 Feb 2025 20:38:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(orderin):=20=E5=85=A5=E5=BA=93=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=B6=E4=BB=B6=E5=8F=B7=E5=88=A4=E6=96=AD=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E4=B8=BA=E7=A9=BA=E6=89=98=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/wms/bussiness/TaskOperation.java            | 2 +-
 .../com/wms/service/serviceImplements/OrderInImplement.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/wms/bussiness/TaskOperation.java b/src/main/java/com/wms/bussiness/TaskOperation.java
index c618c10..98075b8 100644
--- a/src/main/java/com/wms/bussiness/TaskOperation.java
+++ b/src/main/java/com/wms/bussiness/TaskOperation.java
@@ -113,7 +113,7 @@ public class TaskOperation {
             return false;
         }
         AppOrderIn appOrderInForCheck = appOrderIns.get(0);
-        if (appOrderInForCheck.getGoodsId() == null || appOrderInForCheck.getGoodsId().isEmpty()){
+        if ("00000".equals(appOrderInForCheck.getGoodsId())){
             //表示这个为空托盘入库，没有零件号，不记录到库存表中,更新到料箱监控表中。
             Vehicle a = new Vehicle();
             a.setVehicleId(appOrderInForCheck.getVehicleNo());
diff --git a/src/main/java/com/wms/service/serviceImplements/OrderInImplement.java b/src/main/java/com/wms/service/serviceImplements/OrderInImplement.java
index 45fef1a..d415834 100644
--- a/src/main/java/com/wms/service/serviceImplements/OrderInImplement.java
+++ b/src/main/java/com/wms/service/serviceImplements/OrderInImplement.java
@@ -54,7 +54,7 @@ public class OrderInImplement implements IOrderInService {
      * @return 返回结果
      */
     public WmsApiResponse<Object> addOrderIn(downOrderInRequest request){
-            if (Objects.equals(request.efSelect, "G")){
+            if ("00000".equals(request.getGoodsId())){
             log.info("托盘{}为空托盘入库", request.vehicleNo);
             AppOrderIn appOrderIn = new AppOrderIn();
             appOrderIn.setRowId(UUID.randomUUID().toString());
@@ -64,7 +64,7 @@ public class OrderInImplement implements IOrderInService {
             appOrderIn.setVehicleNo(request.vehicleNo);
             appOrderIn.setGoodsId(null);
             appOrderIn.setGoodsNum(null);
-            appOrderIn.setWareHouse(request.abcSelect);
+            appOrderIn.setWareHouse("A");
             appOrderIn.setOrderStatus(0);
             appOrderIn.setCreateTime(LocalDateTime.now());
             appOrderIn.setCreatePerson("WMS");