From b1c8d95d6126ca58a0b331bc494f0daabe2e87c0 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 17 Aug 2022 14:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=96=B0=E5=A2=9E=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/StockOrderPrintEntity.java       |  2 ++
 .../mybatis/mapper/business/StockOrderDao.xml | 21 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java
index cc55a7bb..fa4f0e19 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java
@@ -53,4 +53,6 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
     private String udiCode;         //条码
     private String serialNo;        //序列号
     private String nameCode;
+
+    private String deptName;
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
index cb341175..4121db23 100644
--- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
@@ -282,21 +282,20 @@
 
     <select id="listOrderPrint" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
             resultType="com.glxp.api.admin.entity.business.StockOrderPrintEntity">
-        SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName, stock_order_detail.spec,
-        stock_order_detail.batchNo, stock_order_detail.productDate, stock_order_detail.expireDate,
-        stock_order_detail.count, stock_order_detail.sweepCount,
-        stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory,
-        stock_order_detail.zczbhhzbapzbh,stock_order_detail.price,inv_warehouse.name locInv
-        ,basic_products.spmc
-        FROM stock_order INNER JOIN
-        stock_order_detail on
-        stock_order.id =
-        stock_order_detail.orderIdFk
+        SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName,
+        stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate,
+        stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount,
+        stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,
+        stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc,
+        basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName
+        FROM stock_order
+        INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk
         LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         left join basic_udirel on stock_order_detail.productId = basic_udirel.id
-        INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid
+        left JOIN basic_products on basic_products.uuid = basic_udirel.uuid
+        left join auth_dept on stock_order.dept = auth_dept.`code`
         <where>
             <if test="id != '' and id!=null">
                 and stock_order.id =#{id}