From c577117cb420cbb5ef56e5f5ef3cf32b0785ce8c Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Thu, 23 May 2024 18:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=8A=E6=9E=B6=E5=8D=95?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/wmsansbill/WmsAnsBillService.java | 17 +++++++++++++++--
 .../wmsreceiptbill/WmsReceiptBillService.java   | 15 ++-------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java
index 9ed63ce694..9190784e4f 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java
@@ -157,7 +157,7 @@ public class WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsA
                     );
             //业务类型
             if (StringUtils.isNotBlank(query.getBusTypeKey())) {
-                qw.eq("wab.busTypeKey", query.getBusTypeKey());
+                qw.eq("wab.busTypeValue", query.getBusTypeKey());
             }
             //供应商
             if (StringUtils.isNotBlank(query.getSupplierName())) {
@@ -169,7 +169,20 @@ public class WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsA
                     );
             //单据状态
             if (StringUtils.isNotBlank(query.getBillState())) {
-                qw.like("wab.billState", query.getBillState());
+                String type = "";
+                if (query.getBillState().equals("在途")) {
+                    type = "0";
+                }
+                if (query.getBillState().equals("部分收货")) {
+                    type = "1";
+                }
+                if (query.getBillState().equals("已收货")) {
+                    type = "2";
+                }
+                if (query.getBillState().equals("已取消")) {
+                    type = "3";
+                }
+                qw.eq("wab.billState", type);
             }
 
             //审核状态
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
index 374e524852..b247222498 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
@@ -317,19 +317,8 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
         wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getBillNo());
         wmsReceiptBillVo.setSourceBillSid(wmsAnsBill.getSid());
         wmsReceiptBillVo.setCreateTime(DateUtil.today());
-        if (wmsAnsBill.getBillState() == 0) {
-            wmsReceiptBillVo.setBillStateKey("0");
-            wmsReceiptBillVo.setBillState("在途");
-        } else if (wmsAnsBill.getBillState() == 1) {
-            wmsReceiptBillVo.setBillState("部分收货");
-            wmsReceiptBillVo.setBillStateKey("1");
-        } else if (wmsAnsBill.getBillState() == 2) {
-            wmsReceiptBillVo.setBillState("已收货");
-            wmsReceiptBillVo.setBillStateKey("2");
-        } else if (wmsAnsBill.getBillState() == 3) {
-            wmsReceiptBillVo.setBillState("已取消");
-            wmsReceiptBillVo.setBillStateKey("3");
-        }
+        wmsReceiptBillVo.setBillState("新建");
+        wmsReceiptBillVo.setBillStateKey("0");
         List<WmsAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sourceSid);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {