仓库管理修改

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml

@@ -36,10 +36,20 @@
         WHEN soor.bf_type = -1 THEN NULL
         ELSE soor.bf_type
         END AS bfType,
+        g.goods_code ,        -- 物料编码
+        g.goods_name ,        -- 物料名称
+        g.material_model ,    -- 型号牌号
+        g.specifications , -- 物料规格
+        g.unit_name ,
+        l.location ,
+        l.id AS slId,
             -- 出库凭证表：出库单号、出库日期、出库原因、领料人ID
             sir.sir_code ,
             sir.in_out_date ,
             sir.in_out_reason ,
+            sir.quantity,
+            sir.pi_no,
+            sir.stove_pi_no,
             -- 库房表：出库仓库名称
             sh.sh_name AS shName,
             -- 制单人姓名（主表create_by关联用户表）
@@ -52,6 +62,8 @@
                  -- 左关联出库凭证表：主表sirId关联凭证表主键，过滤已删除
                  LEFT JOIN ST_STOCK_INOUT_RECORD sir ON soor.sir_id = sir.id AND sir.is_deleted = 0
             -- 左关联库房表：主表shId关联库房表主键，过滤已删除
+                 LEFT JOIN st_goods g ON sir.goods_id = g.id AND g.is_deleted = 0
+                 LEFT JOIN ST_STORAGE_LOCATION l ON sir.sl_id = l.id AND l.is_deleted = 0
                  LEFT JOIN ST_STOREHOUSE sh ON soor.sh_id = sh.id AND sh.is_deleted = 0
                  LEFT JOIN ST_CLASS_REQUEST c ON sir.sir_code = c.sir_code AND c.is_deleted = 0
             -- 左关联制单人用户表：主表create_by关联用户表id