From c1c9c0a6e1c3a28f62124a3e1ee49742c5be7090 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 2 Aug 2024 15:08:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9=20=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/purchasebill/PurchaseBillQuery.java    |  2 +-
 .../biz/purchasebill/PurchaseBillService.java  | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java
index 594bde2..6fedc16 100644
--- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java
+++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java
@@ -49,7 +49,7 @@ public class PurchaseBillQuery implements Query {
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("采购员")
-    private String purchaserSid;
+    private String purchaserName;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("发货状态key")
diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java
index 86946f1..318ec10 100644
--- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java
+++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java
@@ -110,19 +110,19 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
             qw.eq("pb.wareHouseSid", query.getWareHouseSid());
         }
         if (StringUtils.isNotBlank(query.getReceiveStateKey())) {
-            qw.eq("pbe.receiveStateValue", query.getReceiveStateKey());
+            qw.eq("pbe.receiveStateKey", query.getReceiveStateKey());
         }
         if (StringUtils.isNotBlank(query.getLogisticsNum())) {
             qw.like("pbe.logisticsNum", query.getLogisticsNum());
         }
         if (StringUtils.isNotBlank(query.getDeliveryStateKey())) {
-            qw.eq("pbe.deliveryStateValue", query.getDeliveryStateKey());
+            qw.eq("pbe.deliveryStateKey", query.getDeliveryStateKey());
         }
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("pb.billNo", query.getBillNo());
         }
-        if (StringUtils.isNotBlank(query.getPurchaserSid())) {
-            qw.like("pb.purchaserSid", query.getPurchaserSid());
+        if (StringUtils.isNotBlank(query.getPurchaserName())) {
+            qw.like("pb.purchaserName", query.getPurchaserName());
         }
         if (StringUtils.isNotBlank(query.getRemarks())) {
             qw.like("pb.remarks", query.getRemarks());
@@ -179,19 +179,19 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
             qw.eq("pb.wareHouseSid", query.getWareHouseSid());
         }
         if (StringUtils.isNotBlank(query.getReceiveStateKey())) {
-            qw.eq("pbe.receiveStateValue", query.getReceiveStateKey());
+            qw.eq("pbe.receiveStateKey", query.getReceiveStateKey());
         }
         if (StringUtils.isNotBlank(query.getLogisticsNum())) {
             qw.like("pbe.logisticsNum", query.getLogisticsNum());
         }
         if (StringUtils.isNotBlank(query.getDeliveryStateKey())) {
-            qw.eq("pbe.deliveryStateValue", query.getDeliveryStateKey());
+            qw.eq("pbe.deliveryStateKey", query.getDeliveryStateKey());
         }
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("pb.billNo", query.getBillNo());
         }
-        if (StringUtils.isNotBlank(query.getPurchaserSid())) {
-            qw.like("pb.purchaserSid", query.getPurchaserSid());
+        if (StringUtils.isNotBlank(query.getPurchaserName())) {
+            qw.like("pb.purchaserName", query.getPurchaserName());
         }
         if (StringUtils.isNotBlank(query.getRemarks())) {
             qw.like("pb.remarks", query.getRemarks());
@@ -236,7 +236,9 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
             purchaseBillAmountService.insertByDto(purchaseBillAmount);
             //保存采购单扩展
             purchaseBillExtend.setBillSid(sid);
+            purchaseBillExtend.setDeliveryStateKey("1");
             purchaseBillExtend.setDeliveryStateValue("未发货");
+            purchaseBillExtend.setReceiveStateKey("1");
             purchaseBillExtend.setReceiveStateValue("待提交");
             purchaseBillExtendService.insertByDto(purchaseBillExtend);
             //保存商品信息