打印新增部门

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;
 }

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,
+        SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName,
-        stock_order_detail.batchNo, stock_order_detail.productDate, stock_order_detail.expireDate,
+        stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate,
-        stock_order_detail.count, stock_order_detail.sweepCount,
+        stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount,
-        stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory,
+        stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,
-        stock_order_detail.zczbhhzbapzbh,stock_order_detail.price,inv_warehouse.name locInv
+        stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc,
-        ,basic_products.spmc
+        basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName
-        FROM stock_order INNER JOIN
+        FROM stock_order
-        stock_order_detail on
+        INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk
-        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}