rev:新增报工时间字段，下料机优先级，缓存线写0（三层缓存线跑）下一道工序设备来料仓排序

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")
             ));

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">

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工作顺序号

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()));

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;
     }
 

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()
       })
     },

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']"