From 17880e035d408bd42124826392a0fba5baa740d7 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 26 May 2023 09:39:21 +0800
Subject: [PATCH] =?UTF-8?q?rev:=20=E5=87=BA=E5=85=A5=E5=BA=93=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml      | 2 +-
 mes/qd/src/views/wms/storage_manage/product/productIn/index.vue | 2 +-
 .../src/views/wms/storage_manage/product/productOut/index.vue   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml
index c4c6e44b..5e4e5c63 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml
@@ -76,7 +76,7 @@
            AND mst.bill_code =#{bill_code}
         </if>
         <if test="iostorinv_id != null and iostorinv_id != ''">
-            AND mst.bill_code =#{iostorinv_id}
+            AND mst.iostorinv_id =#{iostorinv_id}
         </if>
         order by dtl.seq_no ASC
 
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
index 0c0a426c..a30e0165 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
@@ -186,7 +186,7 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="单据类型" :formatter="bill_typeFormat" />
         <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" min-width="120"/>
-        <el-table-column prop="" label="生产车间" width="130" show-overflow-tooltip />
+<!--        <el-table-column prop="" label="生产车间" width="130" show-overflow-tooltip />-->
         <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
         <el-table-column label="总重量" align="center" prop="total_qty">
           <template slot-scope="scope">
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
index f36ed195..6ed67c70 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
@@ -145,7 +145,7 @@
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip :formatter="stateFormat" width="80" prop="bill_status" label="单据状态" />
-        <el-table-column show-overflow-tooltip prop="product_code" label="生产车间" width="80" />
+<!--        <el-table-column show-overflow-tooltip prop="product_code" label="生产车间" width="80" />-->
         <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
         <el-table-column show-overflow-tooltip width="100" prop="biz_date" label="业务日期" />
         <el-table-column show-overflow-tooltip label="明细数" align="center" prop="detail_count" width="60" />