From 915014b5b9389afd307a97c92410e48d050946ec Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 4 Aug 2022 17:56:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E5=A2=9E=E5=8A=A0=E5=88=86=E5=BA=93=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/admin/entity/business/StockOrderPrintEntity.java | 1 + .../main/resources/mybatis/mapper/business/StockOrderDao.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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 647c2719..cc55a7bb 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 @@ -27,6 +27,7 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private BigDecimal totalPrice; private String locInv; + private String subInv; public BigDecimal getPrice() { // if (price == null) 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 e62384fc..d47e8e55 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -311,11 +311,12 @@ select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count, basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh, - inv_warehouse.name locInv,basic_products.spmc, basic_products.cpms + inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc, basic_products.cpms from io_codes INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid LEFT JOIN inv_warehouse ON io_codes.locStorageCode = inv_warehouse.`code` + left join inv_warehouse_sub on io_codes.invWarehouseCode = inv_warehouse_sub.code and io_codes.orderId =#{orderId}