From 99652834797c0a248a812c4c248618d82827ef2f Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 17 Aug 2022 14:28:16 +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 --- .../glxp/sale/admin/entity/inout/StockOrderPrintEntity.java | 2 ++ .../src/main/resources/mybatis/mapper/inout/StockOrderDao.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java index 94af884..fdcc697 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java @@ -52,4 +52,6 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String serialNo; //序列号 private String nameCode; + + private String deptName; } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index d1e49f9..b019e30 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -277,7 +277,7 @@ 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 + 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` @@ -285,6 +285,7 @@ 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 left JOIN basic_products on basic_products.uuid = basic_udirel.uuid + left join auth_dept on stock_order.dept = auth_dept.`code` and stock_order.id =#{id}