From 2dba4b1043fbed5b77651009a4a9acbdea9bc412 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Thu, 20 Jun 2024 10:57:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE=E9=A2=86?=
 =?UTF-8?q?=E6=96=99=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java    | 1 +
 .../com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml | 4 +++-
 .../yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java   | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java
index 86dace6318..6e902ab690 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java
@@ -32,4 +32,5 @@ public class WmsOutBillInventoryQuery implements Query {
 
     private String busrepairBillsid;//维修工单sid
     private String name;
+    private String useOrgSid;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml
index b840e7ddd4..252003e405 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml
@@ -45,7 +45,9 @@
         wi.warehouseRackCode,
         wi.count,
         wi.sid inventorySid,
-        g.price
+        g.price,
+        g.supplierName,
+        wi.cost as money
         from wms_inventory wi
         LEFT JOIN yxt_sms.sms_goods as g ON wi.goodsID = g.goodsID
         <where>
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java
index 64fa5d2d28..c77f46d7c3 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java
@@ -143,6 +143,10 @@ public class WmsOutBillService extends MybatisBaseService<WmsOutBillMapper, WmsO
         if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
             qw.like("wi.warehouseRackCode", query.getWarehouseRackCode());
         }
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("wi.useOrgSid",query.getUseOrgSid());
+        }
+        qw.apply("wi.count > 0");
         //ToDo:供应商
        /* if (StringUtils.isNotBlank(query.getSupplierName())) {
             qw.like("supplierName", query.getSupplierName());