From ecf00d90e9e23bfeff520b5cdf6bf83ad274d181 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Sat, 11 Feb 2023 18:32:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96--=E7=B2=89=E6=96=99?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8E=9F=E6=96=99=E5=88=B0=E8=B4=A7=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=20=EF=BC=8C=E4=BC=98=E5=8C=96--=E6=97=A5=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pdm/service/impl/DailyplanServiceImpl.java    |  3 ++-
 .../org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql  |  4 ++++
 .../wql/statistical_report_query_02.wql           |  3 ++-
 .../src/views/wms/pdm/produce/dailyplan/index.vue | 15 +++++++++++++++
 .../views/wms/statistics/materPlan/StructIvt2.vue |  1 +
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
index 4e6e2bca..e411e393 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
@@ -56,11 +56,12 @@ public class DailyplanServiceImpl implements DailyplanService {
     @Override
     public Map<String, Object> queryAll2(Map whereJson) {
         HashMap<String, String> map = new HashMap<>(whereJson);
-
+        String plan_org_code = map.get("plan_org_code");
         String material_code = map.get("material_code");
         if (StrUtil.isNotEmpty(material_code)) {
             map.put("material_code", "%" + material_code + "%");
         }
+        map.put("plan_org_code",plan_org_code);
         map.put("flag", "1");
         JSONArray json = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).process().getResultJSONArray(0);
         JSONArray ja = new JSONArray();
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
index ed90efa6..4939b5f4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
@@ -25,6 +25,7 @@
     输入.device_id					    TYPEAS s_string
     输入.old_mark					    TYPEAS s_string
     输入.material_id					    TYPEAS s_string
+    输入.plan_org_code					    TYPEAS s_string
     输入.workorder_type					    TYPEAS s_string
 
 
@@ -73,6 +74,9 @@
                 LEFT JOIN PCS_IF_ProductPlanProc ProductPlanProc ON ProductPlanProc.plan_id = pp.plan_id
             WHERE
                 1=1
+                OPTION 输入.plan_org_code <> ""
+                        pp.plan_org_code = 输入.plan_org_code
+                ENDOPTION
                 OPTION 输入.status <> ""
                         pp.status = 输入.status
                 ENDOPTION
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql
index 1a359d48..be955f64 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql
@@ -92,7 +92,8 @@
                 mater.material_name,
                 dtl.pcsn,
                 dtl.receive_code,
-                dtl.material_id
+                dtl.material_id,
+                mst.source_name
              FROM
                 PCS_RC_ReceiveDtl dtl
                 inner JOIN pcs_rc_receivemst mst ON mst.receive_id = dtl.receive_id
diff --git a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
index cac5dc84..8c675a48 100644
--- a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
@@ -71,6 +71,21 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="申报单位">
+            <el-select
+              v-model="query.plan_org_code"
+              clearable
+              style="width: 100px; height: 35px;top: -5px;"
+              placeholder="申报单位"
+            >
+              <el-option
+                v-for="item in Depts"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="产品">
             <el-input
               v-model="query.material_code"
diff --git a/mes/qd/src/views/wms/statistics/materPlan/StructIvt2.vue b/mes/qd/src/views/wms/statistics/materPlan/StructIvt2.vue
index 1e508ec7..20bef9e0 100644
--- a/mes/qd/src/views/wms/statistics/materPlan/StructIvt2.vue
+++ b/mes/qd/src/views/wms/statistics/materPlan/StructIvt2.vue
@@ -57,6 +57,7 @@
       <el-table-column prop="pcsn" label="批次" min-width="100" />
       <el-table-column prop="receive_qty" label="订单重量" min-width="100" :formatter="crud.formatNum2" />
       <el-table-column prop="noin_qty" label="剩余重量" min-width="100" :formatter="crud.formatNum2" />
+      <el-table-column prop="source_name" label="供应商" min-width="100"  />
     </el-table>
   </el-dialog>
 </template>