From 2927e7e25f7b5c7b410683889932d1d11bfe811c Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 29 Nov 2023 10:15:33 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=B8=8B=E6=96=99?=
 =?UTF-8?q?=E6=9C=BA=E4=BC=98=E5=85=88=E7=BA=A7=EF=BC=8C=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=BA=BF=E5=86=990=EF=BC=88=E4=B8=89=E5=B1=82=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E7=BA=BF=E8=B7=91=EF=BC=89=E4=B8=8B=E4=B8=80=E9=81=93?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=AE=BE=E5=A4=87=E6=9D=A5=E6=96=99=E4=BB=93?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acs/service/impl/WmsToAcsServiceImpl.java          |  2 +-
 .../service/device/dao/mapper/PdmBiDeviceMapper.xml    |  1 +
 .../service/workorder/dao/PdmProduceWorkorder.java     |  5 +++++
 .../impl/IPdmProduceWorkorderServiceImpl.java          |  1 +
 .../service/extendtask/SpeMachinery/SpeFullTask.java   |  6 +++++-
 .../src/views/wms/product_manage/workorder/index.vue   | 10 ++++++++--
 mes/qd/src/views/wms/scheduler_manage/task/index.vue   |  1 +
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java
index 05dd50f8..55c089cd 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java
@@ -48,7 +48,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{
                     , "quantity", task.getString("material_qty")
                     , "barcodeArr", task.getString("barcodeArr")
                     , "qtyArr", task.getString("qtyArr")
-                    , "proprity_floor", "2"
+                    , "priority_floor", "0"
                     , "in_pcsn", task.getString("task_code")
                     , "agv_system_type", task.getString("agv_system_type")
             ));
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml
index 3ff3ff76..5fa895bc 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml
@@ -40,6 +40,7 @@
         </if>
         GROUP BY pdm_bi_device.device_code
         HAVING currentQty > #{qty}
+        order by currentQty desc
     </select>
 
     <select id="workproceduceDevicesWeight" resultType="java.util.Map">
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java
index 7d3be433..1a397b31 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java
@@ -234,6 +234,11 @@ public class PdmProduceWorkorder implements Serializable{
       */
      private Date update_time;
 
+     /**
+      * 报工时间
+      */
+     private String stop_time;
+
 
      /**
       * aps工作顺序号
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
index a18c0445..51ba84bc 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
@@ -298,6 +298,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
           workorder.setUpdate_time(new Date());
           workorder.setUpdate_id(SecurityUtils.getCurrentUserId());
           workorder.setUpdate_name(SecurityUtils.getCurrentNickName());
+          workorder.setStop_time(DateUtil.now());
           workorder.setReal_qty(null);
           this.updateById(workorder);
           reportRecordService.update(new UpdateWrapper<PdmProduceWorkorderrecord>().set("report_qty", param.getBigDecimal("report_qty")).set("report_status", ReportEnum.REPORT_STATUS.code("报工")).set("operatetime_end", DateUtil.now()).set("needproduct_qty", Math.max(0, workorder.getPlan_qty().intValue() - workorder.getReport_qty().intValue())).eq("macoperate_id", one.getMacoperate_id()));
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/SpeMachinery/SpeFullTask.java
index fc310547..d67d0ecd 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/SpeMachinery/SpeFullTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/SpeMachinery/SpeFullTask.java
@@ -148,7 +148,11 @@ public class SpeFullTask extends AbstractAcsTask {
             task.put("create_time", DateUtil.now());
             task.put("update_time", DateUtil.now());
             task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_NB.getCode());
-            task.put("priority", "1");}
+            task.put("priority", "1");
+            if (task.getString("point_code1").contains("WXXL")&&form.getString("type").equals(AcsTaskEnum.TASK_PRODUCT_MAC.getCode())){
+                task.put("priority", "5");
+            }
+        }
         return task;
     }
 
diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue
index be1ab0c4..4f7d9c97 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/index.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue
@@ -249,7 +249,7 @@
           type="success"
           @click="suspend(crud.selections)"
         >
-          暂停
+          报工
         </el-button>
         <el-button
           slot="right"
@@ -713,6 +713,11 @@
           label="实际结束时间"
           prop="realproduceend_date"
         />
+        <el-table-column
+          width="160"
+          label="报工时间"
+          prop="stop_time"
+        />
         <el-table-column
           width="160"
           :formatter="dateformat"
@@ -840,6 +845,7 @@ const defaultForm = {
   update_id: null,
   update_name: null,
   update_time: null,
+  stop_time: null,
   is_delete: null
 }
 export default {
@@ -966,7 +972,7 @@ export default {
     suspendreq(rows) {
       rows[0].report_qty = this.reportForm.report_qty
       crudProduceshiftorder.report(rows[0]).then(res => {
-        this.crud.notify('暂停成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.notify('报工成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
     },
diff --git a/mes/qd/src/views/wms/scheduler_manage/task/index.vue b/mes/qd/src/views/wms/scheduler_manage/task/index.vue
index eeb5794e..05fdefc6 100644
--- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue
+++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue
@@ -189,6 +189,7 @@
             <span>{{ parseTime(scope.row.update_time) }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="priority" label="任务优先级" min-width="100" show-overflow-tooltip />
         <el-table-column prop="task_step" label="任务执行步骤" min-width="100" show-overflow-tooltip />
         <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"