From 588b9bdf83dfac74f42671356e4aa1ec072fbf36 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Thu, 4 Aug 2022 17:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/pdm/service/impl/DailyplanServiceImpl.java  |  2 +-
 .../org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql    |  2 +-
 .../views/wms/pdm/produce/dailyplan/StructIvt4.vue  | 13 +++++++------
 3 files changed, 9 insertions(+), 8 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 abaf6a29..f08e5177 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
@@ -62,7 +62,7 @@ public class DailyplanServiceImpl implements DailyplanService {
             map.put("material_code", "%" + material_code + "%");
         }
         map.put("flag", "1");
-        JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "pp.planstart_date");
+        JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "pp.planstart_date,pp.plan_code");
         JSONArray json = jret.getJSONArray("content");
         JSONArray ja = new JSONArray();
         for(int i=0;i<json.size();i++){
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 d5568e11..9b8c9916 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
@@ -140,7 +140,7 @@
                  OPTION 输入.device_id <> ""
                         pp.device_id = 输入.device_id
                 ENDOPTION
-                order by pp.planstart_date
+                order by pp.planstart_date,pp.plan_code
             ENDSELECT
         ENDQUERY
         ENDIF
diff --git a/mes/qd/src/views/wms/pdm/produce/dailyplan/StructIvt4.vue b/mes/qd/src/views/wms/pdm/produce/dailyplan/StructIvt4.vue
index 1a2c15de..14eb40d2 100644
--- a/mes/qd/src/views/wms/pdm/produce/dailyplan/StructIvt4.vue
+++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/StructIvt4.vue
@@ -15,7 +15,7 @@
       </el-col>
       <el-col :span="4">
         <span>
-            <!--左侧插槽-->
+          <!--左侧插槽-->
           <slot name="left" />
           <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
           <el-button slot="left" type="primary" @click="submit">保存</el-button>
@@ -26,6 +26,7 @@
     <el-table
       ref="dragTable"
       :data="tableDtl"
+      row-key="dailyplan_id"
       style="width: 100%;"
       border
       :highlight-current-row="true"
@@ -38,7 +39,7 @@
       <el-table-column prop="planstart_date" label="计划开始日期" width="100" />
       <el-table-column prop="plan_org_name" label="申报单位" width="100" />
       <el-table-column prop="workorder_type" label="计划类型" :formatter="workorder_typeFormat" min-width="120" />
-      <el-table-column prop="material_code" label="物料编码" min-width="150"/>
+      <el-table-column prop="material_code" label="物料编码" min-width="150" />
       <el-table-column prop="old_mark" label="牌号" />
       <el-table-column :formatter="seriesFormat" min-width="80" prop="mater_product_series" label="产品系列" />
       <el-table-column prop="product_weight" label="生产重量(kg)" :formatter="crud.formatNum3" min-width="120" />
@@ -46,10 +47,10 @@
       <el-table-column prop="planend_date" label="计划结束日期" width="100" />
       <el-table-column prop="plan_finish_date" label="交货日期" width="100" />
       <el-table-column prop="day_num" label="提前天数" width="90" :formatter="crud.formatNum0" />
-      <el-table-column  :formatter="stateFormat" min-width="80" prop="status" label="状态" />
+      <el-table-column :formatter="stateFormat" min-width="80" prop="status" label="状态" />
       <el-table-column prop="task_code" label="生产任务号" width="120" />
       <el-table-column prop="create_time" label="创建时间" width="140px" />
-      <el-table-column prop="create_name" label="创建人"  width="100" />
+      <el-table-column prop="create_name" label="创建人" width="100" />
       <el-table-column prop="remark" label="备注" />
     </el-table>
   </el-dialog>
@@ -81,7 +82,7 @@ export default {
       tableDtl: [],
       cxjList: [],
       XLList: [],
-      queryrow: { device_id:'' },
+      queryrow: { device_id: '' },
       sortable: null,
       rows: []
     }
@@ -159,7 +160,7 @@ export default {
         this.crud.notify('无可提交的记录！')
         return false
       }
-      dailyplan.submit2({ query: this.queryrow, rows: this.rows}).then(res => {
+      dailyplan.submit2({ query: this.queryrow, rows: this.rows }).then(res => {
         this.crud.notify('操作成功！')
         this.tableDtl = []
         this.$emit('update:dialogShow', false)