From 1f7f3affa441e1e21df2ccea46fa7f262325508c Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 30 三月 2026 18:51:27 +0800
Subject: [PATCH] 锦隆条码生成调整

---
 src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index d76e0d4..4b508cc 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -219,6 +219,7 @@
         openPage: { type: String, },
         propHMaterID: {},
         propHOrgID: {},
+        propMarkVal: {},
     },
     data() {
         return {
@@ -397,11 +398,15 @@
             if (this.propHOrgID) {
                 this.sWhere += " and HOrgID like '%" + this.propHOrgID + "%'";
             }
+            console.log(this.propHMaterID)
             if (this.propHMaterID) {
                 this.sWhere += " and HMaterID like '%" + this.propHMaterID + "%'";
             }
+            // if(this.propMarkVal){
+            //     this.sWhere += " and 榛樿鍙戣揣瀹瑰櫒鏍囪 = 'Y'"
+            // }
               if (this.openPage) {
-                this.sWhere += " and HUseFlag != '0' and HSendPackFlag != '0' and ISNULL(瀹℃牳浜�,'')  != ''"
+                this.sWhere += " and 浣跨敤鏍囪 = 'Y' and 鍙戣揣瀹瑰櫒鏍囪 = 'Y' and ISNULL(瀹℃牳浜�,'')  != ''"
             }
             console.log(this.sWhere)
             // 鍒楄〃

--
Gitblit v1.9.1