From 5ebeb79716eba8b75dab5c2372b42ded75ea06ce Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 5 Jul 2022 13:43:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/sale/admin/entity/inout/StockOrderPrintEntity.java | 1 + .../main/resources/mybatis/mapper/inout/StockOrderDao.xml | 6 +++++- 2 files changed, 6 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 1cd68ef..42b4f74 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 @@ -44,4 +44,5 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String remark2; private String remark3; private String manufactory; + private String spmc; } 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 19d6460..764f75b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -263,13 +263,17 @@ 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 FROM stock_order INNER JOIN + stock_order_detail.zczbhhzbapzbh,stock_order_detail.price,inv_warehouse.name locInv,productinfo.spmc 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 + INNER JOIN productinfo on productinfo.uuid = basic_products.originUuid and stock_order.id =#{id}