From f6bbfd17dae78bb278b85b7318f9d4f9671e2d62 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 5 Jul 2022 16:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BA=A7=E5=93=81=E6=8F=8F=E8=BF=B0=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=90=8D=E7=A7=B0=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 +
 .../src/main/resources/mybatis/mapper/inout/StockOrderDao.xml  | 3 ++-
 2 files changed, 3 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 42b4f74..d5a8461 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
@@ -45,4 +45,5 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
     private String remark3;
     private String manufactory;
     private String spmc;
+    private String cpms;
 }
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 764f75b..a845e28 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
@@ -263,7 +263,8 @@
         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,productinfo.spmc FROM
+        stock_order_detail.zczbhhzbapzbh,stock_order_detail.price,inv_warehouse.name locInv,productinfo.spmc,
+        basic_products.cpms FROM
         stock_order INNER JOIN
         stock_order_detail on
         stock_order.id =