From b762ec097a64a08b4233ca278fb6d4b2463725d2 Mon Sep 17 00:00:00 2001
From: baoge <751575283@qq.com>
Date: Mon, 17 Apr 2023 11:22:36 +0800
Subject: [PATCH 01/19] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E5=8D=8A=E6=88=90?=
 =?UTF-8?q?=E5=93=81=E5=87=BA=E5=BA=93=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/qd/src/api/wms/st/out/semiProductOut.js   | 351 +++++++++--------
 mes/qd/src/views/wms/st/productOut/AddDtl.vue |   2 +-
 .../views/wms/st/productOut/ViewDialog.vue    | 150 +++----
 .../views/wms/st/semiProductIn/AddDialog.vue  | 245 ++++++++----
 .../views/wms/st/semiProductOut/AddDialog.vue | 368 ++++++++++++------
 .../views/wms/st/semiProductOut/AddDtl.vue    | 114 ++++--
 6 files changed, 714 insertions(+), 516 deletions(-)

diff --git a/mes/qd/src/api/wms/st/out/semiProductOut.js b/mes/qd/src/api/wms/st/out/semiProductOut.js
index 8d4c1e1c..caeea7c9 100644
--- a/mes/qd/src/api/wms/st/out/semiProductOut.js
+++ b/mes/qd/src/api/wms/st/out/semiProductOut.js
@@ -1,228 +1,261 @@
 import request from '@/utils/request'
 
 export function add(data) {
-  return request({
-    url: 'api/productOut',
-    method: 'post',
-    data
-  })
+    return request({
+        url: 'api/semiProductOut',
+        method: 'post',
+        data
+    })
 }
 
 export function del(ids) {
-  return request({
-    url: 'api/productOut/',
-    method: 'delete',
-    data: ids
-  })
+    return request({
+        url: 'api/semiProductOut/',
+        method: 'delete',
+        data: ids
+    })
 }
 
 export function edit(data) {
-  return request({
-    url: 'api/productOut',
-    method: 'put',
-    data
-  })
+    return request({
+        url: 'api/semiProductOut',
+        method: 'put',
+        data
+    })
 }
 
 export function getOutBillDtl(data) {
-  return request({
-    url: '/api/productOut/getOutBillDtl',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/getOutBillDtl',
+        method: 'post',
+        data
+    })
 }
 export function getOutBillDis(data) {
-  return request({
-    url: '/api/productOut/getOutBillDis',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/getOutBillDis',
+        method: 'post',
+        data
+    })
 }
 export function getOutBillDisDtl(params) {
-  return request({
-    url: '/api/productOut/getOutBillDisDtl',
-    method: 'get',
-    params
-  })
+    return request({
+        url: '/api/semiProductOut/getOutBillDisDtl',
+        method: 'get',
+        params
+    })
 }
 export function getOutBillTask(params) {
-  return request({
-    url: '/api/productOut/getOutBillTask',
-    method: 'get',
-    params
-  })
+    return request({
+        url: '/api/semiProductOut/getOutBillTask',
+        method: 'get',
+        params
+    })
 }
 export function getInvTypes() {
-  return request({
-    url: '/api/productOut/getInvTypes',
-    method: 'get'
-  })
+    return request({
+        url: '/api/semiProductOut/getInvTypes',
+        method: 'get'
+    })
 }
 export function insertDtl(data) {
-  return request({
-    url: '/api/productOut/insertDtl',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/insertDtl',
+        method: 'post',
+        data
+    })
 }
 export function allDiv(data) {
-  return request({
-    url: '/api/productOut/allDiv',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/allDiv',
+        method: 'post',
+        data
+    })
 }
 export function allDivOne(data) {
-  return request({
-    url: '/api/productOut/allDivOne',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/allDivOne',
+        method: 'post',
+        data
+    })
 }
 export function allCancel(data) {
-  return request({
-    url: '/api/productOut/allCancel',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/allCancel',
+        method: 'post',
+        data
+    })
 }
 export function oneCancel(data) {
-  return request({
-    url: '/api/productOut/oneCancel',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/oneCancel',
+        method: 'post',
+        data
+    })
 }
 export function setPoint(data) {
-  return request({
-    url: '/api/productOut/setPoint',
-    method: 'post',
-    data
-  })
+
+    return request({
+        url: '/api/semiProductOut/setPoint',
+        method: 'post',
+        data
+    })
 }
 export function oneSetPoint(data) {
-  return request({
-    url: '/api/productOut/oneSetPoint',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/oneSetPoint',
+        method: 'post',
+        data
+    })
 }
 export function getStructIvt(params) {
-  return request({
-    url: '/api/productOut/getStructIvt',
-    method: 'get',
-    params
-  })
+    return request({
+        url: '/api/semiProductOut/getStructIvt',
+        method: 'get',
+        params
+    })
 }
 export function manualDiv(data) {
-  return request({
-    url: '/api/productOut/manualDiv',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/manualDiv',
+        method: 'post',
+        data
+    })
 }
 export function confirm(data) {
-  return request({
-    url: '/api/productOut/confirm',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/confirm',
+        method: 'post',
+        data
+    })
 }
 export function issueTask(data) {
-  return request({
-    url: '/api/productOut/issueTask',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/issueTask',
+        method: 'post',
+        data
+    })
 }
 export function finishTask(data) {
-  return request({
-    url: '/api/productOut/finishTask',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/finishTask',
+        method: 'post',
+        data
+    })
 }
 export function cancleTaskfinish(data) {
-  return request({
-    url: '/api/productOut/cancleTaskfinish',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/cancleTaskfinish',
+        method: 'post',
+        data
+    })
 }
 export function paramByCodeType(data) {
-  return request({
-    url: '/api/productOut/paramByCodeType',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/paramByCodeType',
+        method: 'post',
+        data
+    })
 }
 export function schAreaType(data) {
-  return request({
-    url: '/api/productOut/schAreaType',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/schAreaType',
+        method: 'post',
+        data
+    })
 }
 export function backConfirm(data) {
-  return request({
-    url: '/api/productOut/backConfirm',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/backConfirm',
+        method: 'post',
+        data
+    })
 }
 export function getType() {
-  return request({
-    url: '/api/productOut/getType',
-    method: 'get'
-  })
+    return request({
+        url: '/api/semiProductOut/getType',
+        method: 'get'
+    })
 }
 export function moneySubmit(data) {
-  return request({
-    url: '/api/productOut/moneySubmit',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/moneySubmit',
+        method: 'post',
+        data
+    })
 }
 export function getDisNum(data) {
-  return request({
-    url: '/api/productOut/getDisNum',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/getDisNum',
+        method: 'post',
+        data
+    })
 }
 export function queryBox(data) {
-  return request({
-    url: '/api/productOut/queryBox',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/queryBox',
+        method: 'post',
+        data
+    })
 }
 export function getOutBillTask2(data) {
-  return request({
-    url: '/api/productOut/getOutBillTask2',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/getOutBillTask2',
+        method: 'post',
+        data
+    })
 }
 export function cancelTask(data) {
-  return request({
-    url: '/api/productOut/cancelTask',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/cancelTask',
+        method: 'post',
+        data
+    })
 }
 export function allSetPoint(data) {
-  return request({
-    url: '/api/productOut/allSetPoint',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/allSetPoint',
+        method: 'post',
+        data
+    })
 }
 export function oneSetPoint2(data) {
-  return request({
-    url: '/api/productOut/oneSetPoint2',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/semiProductOut/oneSetPoint2',
+        method: 'post',
+        data
+    })
+}
+export default {
+    add,
+    edit,
+    del,
+    allDiv,
+    allCancel,
+    getOutBillDtl,
+    getOutBillDis,
+    setPoint,
+    oneSetPoint,
+    getOutBillTask,
+    getStructIvt,
+    manualDiv,
+    confirm,
+    issueTask,
+    finishTask,
+    cancleTaskfinish,
+    getInvTypes,
+    paramByCodeType,
+    schAreaType,
+    backConfirm,
+    getOutBillDisDtl,
+    getType,
+    allDivOne,
+    moneySubmit,
+    getDisNum,
+    queryBox,
+    getOutBillTask2,
+    oneCancel,
+    cancelTask,
+    allSetPoint,
+    oneSetPoint2
 }
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }
diff --git a/mes/qd/src/views/wms/st/productOut/AddDtl.vue b/mes/qd/src/views/wms/st/productOut/AddDtl.vue
index 2c67efa6..3dc1c400 100644
--- a/mes/qd/src/views/wms/st/productOut/AddDtl.vue
+++ b/mes/qd/src/views/wms/st/productOut/AddDtl.vue
@@ -81,7 +81,7 @@ export default {
   components: { rrOperation, pagination },
   cruds() {
     return CRUD({
-      title: '用户', url: 'api/productOut/addDtl',
+      title: '用户', url: 'api/semiProductOut/addDtl',
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/st/productOut/ViewDialog.vue b/mes/qd/src/views/wms/st/productOut/ViewDialog.vue
index 6d2f6669..daea24ca 100644
--- a/mes/qd/src/views/wms/st/productOut/ViewDialog.vue
+++ b/mes/qd/src/views/wms/st/productOut/ViewDialog.vue
@@ -1,69 +1,28 @@
 <template>
-  <el-dialog
-    append-to-body
-    title="出库单详情"
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    fullscreen
-    @close="close"
-    @open="open"
-  >
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
+  <el-dialog append-to-body title="出库单详情" :visible.sync="dialogVisible" destroy-on-close fullscreen @close="close"
+    @open="open">
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form"
+      size="mini" label-width="85px" label-suffix=":">
       <el-form-item label="单据号" prop="bill_code">
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
       </el-form-item>
       <el-form-item label="生产区域">
-        <el-select
-          v-model="form.product_code"
-          clearable
-          size="mini"
-          placeholder="全部"
-          :disabled="true"
-          class="filter-item"
-          @change="crud.toQuery"
-        >
-          <el-option
-            v-for="item in dict.product_area"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model="form.product_code" clearable size="mini" placeholder="全部" :disabled="true" class="filter-item"
+          @change="crud.toQuery">
+          <el-option v-for="item in dict.product_area" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="业务类型" prop="bill_type">
-        <el-select
-          v-model="form.bill_type"
-          clearable
-          filterable
-          size="mini"
-          placeholder="业务类型"
-          class="filter-item"
-          disabled
-        >
-          <el-option
-            v-for="item in dict.bill_type"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model="form.bill_type" clearable filterable size="mini" placeholder="业务类型" class="filter-item"
+          disabled>
+          <el-option v-for="item in dict.bill_type" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="单据状态" prop="bill_status">
-        <el-select
-          v-model="form.bill_status"
-          clearable
-          style="width: 210px"
-          placeholder="单据状态"
-          class="filter-item"
-          disabled
-        >
-          <el-option
-            v-for="item in dict.io_bill_status"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model="form.bill_status" clearable style="width: 210px" placeholder="单据状态" class="filter-item"
+          disabled>
+          <el-option v-for="item in dict.io_bill_status" :key="item.id" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="明细数" prop="detail_count">
@@ -72,17 +31,12 @@
       </el-form-item>
       <el-form-item label="总重量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
-        <el-input-number
-          v-model="form.total_qty"
-          :controls="false"
-          :precision="3"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
+        <el-input-number v-model="form.total_qty" :controls="false" :precision="3" :min="0" disabled
+          style="width: 210px" />
       </el-form-item>
       <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"
+          value-format="yyyy-MM-dd" :disabled="true" />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
@@ -92,19 +46,11 @@
     <div class="crud-opts2">
       <span class="role-span2">出库明细</span>
     </div>
-    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+    <el-card class="box-card" shadow="never" :body-style="{ padding: '0' }">
       <!--表格渲染-->
-      <el-table
-        ref="table"
-        :data="tableDtl"
-        style="width: 100%;"
-        max-height="300"
-        size="mini"
-        border
-        :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        @current-change="handleDtlCurrentChange"
-      >
+      <el-table ref="table" :data="tableDtl" style="width: 100%;" max-height="300" size="mini" border
+        :highlight-current-row="true" :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
+        @current-change="handleDtlCurrentChange">
         <el-table-column type="index" label="序号" width="55" align="center" />
         <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
         <el-table-column min-width="140" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
@@ -121,19 +67,11 @@
     <div class="crud-opts2">
       <span class="role-span">作业明细</span>
     </div>
-    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+    <el-card class="box-card" shadow="never" :body-style="{ padding: '0' }">
       <!--表格渲染-->
-      <el-table
-        ref="table2"
-        :data="tabledis"
-        style="width: 100%;"
-        max-height="300"
-        size="mini"
-        border
-        :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        @current-change="handleDisCurrentChange"
-      >
+      <el-table ref="table2" :data="tabledis" style="width: 100%;" max-height="300" size="mini" border
+        :highlight-current-row="true" :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
+        @current-change="handleDisCurrentChange">
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
@@ -155,7 +93,7 @@ import crudProductIn from '@/views/wms/st/productIn/productin'
 
 export default {
   name: 'ViewDialog',
-  components: { },
+  components: {},
   mixins: [crud()],
   dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL', 'bill_type', 'product_area'],
   props: {
@@ -167,7 +105,7 @@ export default {
       type: Object
     }
   },
-  data() {
+  data () {
     return {
       dialogVisible: false,
       tableDtl: [],
@@ -180,26 +118,26 @@ export default {
   },
   watch: {
     dialogShow: {
-      handler(newValue) {
+      handler (newValue) {
         this.dialogVisible = newValue
       }
     },
     rowmst: {
-      handler(newValue) {
+      handler (newValue) {
         this.form = newValue
       }
     }
   },
-  created() {
+  created () {
     crudProductIn.queryStor().then(res => {
       this.storlist = res
     })
   },
   methods: {
-    open() {
+    open () {
       this.queryTableDtl()
     },
-    close() {
+    close () {
       this.$emit('update:dialogShow', false)
       this.currentDis = {}
       this.currentdtl = null
@@ -207,19 +145,19 @@ export default {
       this.tabledis = []
       this.$emit('AddChanged')
     },
-    bill_statusFormat(row) {
+    bill_statusFormat (row) {
       return this.dict.label.io_bill_status[row.bill_status]
     },
-    taskdtl_typeFormat(row) {
+    taskdtl_typeFormat (row) {
       return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
     },
-    task_statusFormat(row) {
+    task_statusFormat (row) {
       return this.dict.label.task_status[row.task_status]
     },
-    work_statusFormat(row) {
+    work_statusFormat (row) {
       return this.dict.label.work_status[row.work_status]
     },
-    handleDtlCurrentChange(current) {
+    handleDtlCurrentChange (current) {
       if (current !== null) {
         this.tabledis = []
         this.currentdtl = current
@@ -229,22 +167,22 @@ export default {
         this.currentdtl = {}
       }
     },
-    invtypeFormat(row, column) {
+    invtypeFormat (row, column) {
       for (const item of this.billtypelist) {
         if (item.code === row.source_bill_type) {
           return item.name
         }
       }
     },
-    handleDisCurrentChange(current) {
+    handleDisCurrentChange (current) {
       this.currentDis = current
     },
-    queryTableDtl() {
+    queryTableDtl () {
       productOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
         this.tableDtl = res
       })
     },
-    queryTableDdis() {
+    queryTableDdis () {
       if (this.currentdtl !== null) {
         productOut.getOutBillDis({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
           this.tabledis = res
@@ -267,15 +205,15 @@ export default {
 
 .crud-opts2 .el-dialog__title2 {
   line-height: 24px;
-  font-size:20px;
-  color:#303133;
+  font-size: 20px;
+  color: #303133;
 }
 
 .crud-opts2 .role-span2 {
   padding: 0px 0px 20px 0px;
 }
+
 .crud-opts2 {
   padding: 10px 0px 0px 50px;
 }
-
 </style>
diff --git a/mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue b/mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue
index a0cc83c9..b131a868 100644
--- a/mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue
+++ b/mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue
@@ -15,16 +15,44 @@
       </el-col>
       <el-col :span="4">
         <span>
-          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
-          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+          <el-button
+            icon="el-icon-check"
+            size="mini"
+            :loading="crud.cu === 2"
+            type="primary"
+            @click="crud.submitCU"
+            >保存</el-button
+          >
+          <el-button
+            icon="el-icon-close"
+            size="mini"
+            type="info"
+            @click="crud.cancelCU"
+            >关闭</el-button
+          >
         </span>
       </el-col>
     </el-row>
 
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
+    <el-form
+      ref="form"
+      style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+      :inline="true"
+      :model="form"
+      :rules="rules"
+      size="mini"
+      label-width="85px"
+      label-suffix=":"
+    >
       <el-form-item label="单据号" prop="bill_code">
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
-        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+        <el-input
+          v-model="form.bill_code"
+          disabled
+          placeholder="系统生成"
+          clearable
+          style="width: 210px"
+        />
       </el-form-item>
       <el-form-item label="仓库" prop="product_code">
         <label slot="label">生产区域:</label>
@@ -79,7 +107,12 @@
       </el-form-item>
       <el-form-item label="明细数" prop="detail_count">
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
-        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
+        <el-input
+          v-model="form.detail_count"
+          size="mini"
+          disabled
+          style="width: 210px"
+        />
       </el-form-item>
       <el-form-item label="总重量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -93,11 +126,26 @@
         />
       </el-form-item>
       <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
+        <el-date-picker
+          v-model="form.biz_date"
+          type="date"
+          placeholder="选择日期"
+          style="width: 210px"
+          value-format="yyyy-MM-dd"
+          :disabled="crud.status.view > 0"
+        />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+        <label slot="label"
+          >备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label
+        >
+        <el-input
+          v-model="form.remark"
+          style="width: 380px;"
+          rows="2"
+          type="textarea"
+          :disabled="crud.status.view > 0"
+        />
       </el-form-item>
     </el-form>
 
@@ -117,7 +165,6 @@
           添加物料
         </el-button>
       </span>
-
     </div>
     <!--表格渲染-->
     <el-table
@@ -125,13 +172,25 @@
       :data="form.tableData"
       style="width: 100%;"
       border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
     >
       <el-table-column type="index" label="序号" width="55" align="center" />
 
-      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
-      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
-      <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
+      <el-table-column
+        show-overflow-tooltip
+        prop="material_code"
+        label="物料编码"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="material_name"
+        label="物料名称"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="material_spec"
+        label="物料规格"
+      />
       <el-table-column show-overflow-tooltip prop="pcsn" label="订单号">
         <template slot-scope="scope">
           <el-input
@@ -156,7 +215,13 @@
           />
         </template>
       </el-table-column>
-      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
+      <el-table-column
+        v-if="crud.status.cu > 0"
+        align="center"
+        label="操作"
+        width="170"
+        fixed="right"
+      >
         <template scope="scope">
           <el-button
             type="danger"
@@ -175,33 +240,32 @@
       :mater-opt-code="materType"
       @setMaterValue="tableChanged"
     />
-
   </el-dialog>
 </template>
 
 <script>
-import CRUD, { crud, form } from '@crud/crud'
-import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
-import MaterDtl from '@/views/wms/pub/MaterDialog'
+import CRUD, { crud, form } from "@crud/crud";
+import crudSemiProductIn from "@/api/wms/st/in/semiProductIn";
+import MaterDtl from "@/views/wms/pub/MaterDialog";
 
 const defaultForm = {
-  bill_code: '',
-  product_code: 'A1',
-  bill_status: '10',
-  total_qty: '0',
-  detail_count: '0',
-  bill_type: '',
-  remark: '',
+  bill_code: "",
+  product_code: "A1",
+  bill_status: "10",
+  total_qty: "0",
+  detail_count: "0",
+  bill_type: "",
+  remark: "",
   biz_date: new Date(),
-  create_mode: '',
+  create_mode: "",
   tableData: []
-}
+};
 
 export default {
-  name: 'AddDialog',
+  name: "AddDialog",
   components: { MaterDtl },
   mixins: [crud(), form(defaultForm)],
-  dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
+  dicts: ["IO_BILL_STATUS", "ST_QUALITY_SCODE", "bill_type", "product_area"],
   props: {
     dialogShow: {
       type: Boolean,
@@ -217,121 +281,130 @@ export default {
       materShow: false,
       dtlShow: false,
       opendtlParam: null,
-      materType: '03', // 关键成品
+      materType: "03", // 关键成品
       storlist: [],
       billtypelist: [],
       rules: {
         product_code: [
-          { required: true, message: '生产区域不能为空', trigger: 'blur' }
+          { required: true, message: "生产区域不能为空", trigger: "blur" }
         ],
         bill_type: [
-          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+          { required: true, message: "业务类型不能为空", trigger: "blur" }
         ],
         biz_date: [
-          { required: true, message: '业务日期不能为空', trigger: 'blur' }
+          { required: true, message: "业务日期不能为空", trigger: "blur" }
         ]
       }
-    }
+    };
   },
   watch: {
     dialogShow: {
       handler(newValue, oldValue) {
-        this.dialogVisible = newValue
+        this.dialogVisible = newValue;
       }
     }
   },
   methods: {
     open() {
       crudSemiProductIn.queryStor().then(res => {
-        this.storlist = res
-      })
+        this.storlist = res;
+      });
     },
     close() {
-      this.$emit('AddChanged')
+      this.$emit("AddChanged");
     },
     [CRUD.HOOK.afterToEdit]() {
       // 获取入库单明细
-      crudSemiProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
+      crudSemiProductIn
+        .getIODtl({ bill_code: this.form.bill_code })
+        .then(res => {
+          this.form.tableData = res;
+          // 将明细变成不可编辑
+          for (let i = 0; i < this.form.tableData.length; i++) {
+            const row = this.form.tableData[i];
+            this.form.tableData.splice(i, 1, row);
+          }
+        });
     },
     [CRUD.HOOK.afterToView]() {
-      crudSemiProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
+      crudSemiProductIn
+        .getIODtl({ bill_code: this.form.bill_code })
+        .then(res => {
+          this.form.tableData = res;
+          // 将明细变成不可编辑
+          for (let i = 0; i < this.form.tableData.length; i++) {
+            const row = this.form.tableData[i];
+            this.form.tableData.splice(i, 1, row);
+          }
+        });
     },
 
     [CRUD.HOOK.beforeSubmit]() {
       // 提交前校验
       if (this.form.tableData.length === 0) {
-        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
+        this.crud.notify("请至少选择一条明细", CRUD.NOTIFICATION_TYPE.INFO);
+        return false;
       }
 
       for (let i = 0; i < this.form.tableData.length; i++) {
-        const row = this.form.tableData[i]
+        const row = this.form.tableData[i];
         if (!row.pcsn || !row.plan_qty) {
-          this.crud.notify('订单号、数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
+          this.crud.notify("订单号、数量不能为空", CRUD.NOTIFICATION_TYPE.INFO);
+          return false;
         }
       }
     },
     deleteRow(index, rows) {
-      const material_code = rows[index].material_code
-      let len = rows.length
+      const material_code = rows[index].material_code;
+      let len = rows.length;
       while (len--) {
-        const obj = rows[len]
+        const obj = rows[len];
         if (material_code === obj.material_code) {
-          const index = rows.indexOf(obj)
-          if (index > -1) { // 移除找到的指定元素
-            this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
-            rows.splice(index, 1)
-            this.form.detail_count = this.form.tableData.length
+          const index = rows.indexOf(obj);
+          if (index > -1) {
+            // 移除找到的指定元素
+            this.form.total_qty =
+              parseFloat(this.form.total_qty) -
+              parseFloat(rows[index].plan_qty);
+            rows.splice(index, 1);
+            this.form.detail_count = this.form.tableData.length;
           }
         }
       }
     },
     tableChanged(rows) {
       // 对新增的行进行校验不能存在相同物料批次
-      rows.forEach((item) => {
-        let same_mater = true
-        this.form.tableData.forEach((row) => {
+      rows.forEach(item => {
+        let same_mater = true;
+        this.form.tableData.forEach(row => {
           if (row.material_code === item.material_code) {
-            same_mater = false
+            same_mater = false;
           }
-        })
+        });
         if (same_mater) {
-          item.quality_scode = '01'
-          item.ivt_level = '01'
-          item.is_active = '1'
-          item.plan_qty = '1'
-          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
-          this.form.tableData.splice(-1, 0, item)
+          item.quality_scode = "01";
+          item.ivt_level = "01";
+          item.is_active = "1";
+          item.plan_qty = "1";
+          this.form.total_qty =
+            parseFloat(this.form.total_qty) + parseFloat(item.plan_qty);
+          this.form.tableData.splice(-1, 0, item);
         }
-      })
-      this.form.detail_count = this.form.tableData.length
+      });
+      this.form.detail_count = this.form.tableData.length;
     },
     insertEvent(row) {
-      this.materShow = true
+      this.materShow = true;
     },
     changeQty() {
-      this.form.total_qty = 0
-      this.form.tableData.forEach((item) => {
-        this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
-      })
+      this.form.total_qty = 0;
+      this.form.tableData.forEach(item => {
+        this.form.total_qty =
+          parseFloat(this.form.total_qty) + parseFloat(item.plan_qty);
+      });
     }
   }
-}
+};
 </script>
 
 <style>
diff --git a/mes/qd/src/views/wms/st/semiProductOut/AddDialog.vue b/mes/qd/src/views/wms/st/semiProductOut/AddDialog.vue
index 1f2a428a..a331e327 100644
--- a/mes/qd/src/views/wms/st/semiProductOut/AddDialog.vue
+++ b/mes/qd/src/views/wms/st/semiProductOut/AddDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="出库单编辑"
+    title="出库单新增"
     append-to-body
     fullscreen
     :before-close="crud.cancelCU"
@@ -14,23 +14,50 @@
       </el-col>
       <el-col :span="4">
         <span>
-          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
-          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+          <el-button
+            icon="el-icon-check"
+            size="mini"
+            :loading="crud.cu === 2"
+            type="primary"
+            @click="crud.submitCU"
+            >保存</el-button
+          >
+          <el-button
+            icon="el-icon-close"
+            size="mini"
+            type="info"
+            @click="crud.cancelCU"
+            >关闭</el-button
+          >
         </span>
       </el-col>
     </el-row>
 
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
+    <el-form
+      ref="form"
+      style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+      :inline="true"
+      :model="form"
+      :rules="rules"
+      size="mini"
+      label-width="85px"
+      label-suffix=":"
+    >
       <el-form-item label="单据号" prop="bill_code">
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
-        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+        <el-input
+          v-model="form.bill_code"
+          disabled
+          placeholder="系统生成"
+          clearable
+          style="width: 210px"
+        />
       </el-form-item>
       <el-form-item label="生产区域" prop="product_code">
         <label slot="label">生产区域:</label>
         <el-select
           v-model="form.product_code"
           clearable
-          placeholder="生产区域"
           class="filter-item"
           style="width: 210px"
           :disabled="crud.status.view > 0"
@@ -80,7 +107,12 @@
       </el-form-item>
       <el-form-item label="明细数" prop="detail_count">
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
-        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
+        <el-input
+          v-model="form.detail_count"
+          size="mini"
+          disabled
+          style="width: 210px"
+        />
       </el-form-item>
       <el-form-item label="总重量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -94,18 +126,32 @@
         />
       </el-form-item>
       <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
+        <el-date-picker
+          v-model="form.biz_date"
+          type="date"
+          placeholder="选择日期"
+          style="width: 210px"
+          value-format="yyyy-MM-dd"
+          :disabled="crud.status.view > 0"
+        />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+        <label slot="label"
+          >备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label
+        >
+        <el-input
+          v-model="form.remark"
+          style="width: 380px;"
+          rows="2"
+          type="textarea"
+          :disabled="crud.status.view > 0"
+        />
       </el-form-item>
     </el-form>
 
     <div class="crud-opts2">
       <span class="role-span">出库明细</span>
       <span v-if="crud.status.cu > 0" class="crud-opts-right2">
-
         <!--左侧插槽-->
         <slot name="left" />
         <el-button
@@ -118,7 +164,7 @@
         >
           添加物料
         </el-button>
-     <!--   <el-button
+        <!--   <el-button
           slot="left"
           class="filter-item"
           type="primary"
@@ -129,7 +175,6 @@
           新增一行
         </el-button>-->
       </span>
-
     </div>
     <!--表格渲染-->
     <el-table
@@ -137,72 +182,128 @@
       :data="form.tableData"
       style="width: 100%;"
       border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
     >
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
-       <!-- <template scope="scope">
+      <el-table-column
+        show-overflow-tooltip
+        prop="material_code"
+        label="物料编码"
+        width="190"
+        align="center"
+      >
+        <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
             <el-button slot="append" icon="el-icon-search" @click="queryMater(scope.$index, scope.row)" />
           </el-input>
           <span v-show="scope.row.edit">{{ scope.row.material_code }}</span>
-        </template>-->
+        </template>
       </el-table-column>
-      <el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="物料规格" align="center" min-width="150px" show-overflow-tooltip />
-      <el-table-column show-overflow-tooltip prop="pcsn" label="订单号" width="150px" align="center">
-     <!--   <template scope="scope">
+      <el-table-column
+        prop="material_name"
+        label="物料名称"
+        align="center"
+        min-width="150px"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="material_spec"
+        label="物料规格"
+        align="center"
+        min-width="150px"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="pcsn"
+        label="订单号"
+        width="150px"
+        align="center"
+      >
+        <!--   <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.pcsn" size="mini" />
           <span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
         </template>-->
       </el-table-column>
-      <el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
+      <el-table-column
+        prop="plan_qty"
+        label="出库重量"
+        width="150"
+        align="center"
+      >
         <template scope="scope">
-          <el-input-number v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
-<!--          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
+          <el-input-number
+            v-model="scope.row.plan_qty"
+            :precision="3"
+            :controls="false"
+            :min="1"
+            style="width: 120px"
+          />
+          <!--          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
         </template>
       </el-table-column>
       <el-table-column prop="qty_unit_name" label="单位" align="center" />
-   <!--   <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
+      <!--   <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
         <template scope="scope">
           <el-input v-model="scope.row.remark" size="mini" />
           <span>{{ scope.row.remark }}</span>
         </template>
       </el-table-column>-->
-      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
+      <el-table-column
+        v-if="crud.status.cu > 0"
+        align="center"
+        label="操作"
+        width="160"
+        fixed="right"
+      >
         <template scope="scope">
-          <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
+          <el-button
+            type="danger"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-delete"
+            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
+          />
         </template>
       </el-table-column>
     </el-table>
 
-    <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged5" />
-    <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />
+    <AddDtl
+      :dialog-show.sync="dtlShow"
+      :stor-id="storId"
+      @tableChanged="tableChanged5"
+    />
+    <MaterDialog
+      :dialog-show.sync="materShow"
+      :mater-opt-code.sync="materType"
+      @setMaterValue="setMaterValue"
+    />
   </el-dialog>
 </template>
 
 <script>
-import CRUD, { crud, form } from '@crud/crud'
-import AddDtl from '@/views/wms/st/semiProductOut/AddDtl'
-import MaterDialog from '@/views/wms/pub/MaterDialog'
-import crudSemiProductIn from '@/api/wms/st/out/semiProductOut'
+import CRUD, { crud, form } from "@crud/crud";
+import AddDtl from "@/views/wms/st/semiProductOut/AddDtl";
+import MaterDialog from "@/views/wms/pub/MaterDialog";
+import crudSemiProductIn from "@/api/wms/st/out/semiProductOut";
 const defaultForm = {
-  bill_code: '',
-  stor_id: '',
-  stor_code: '',
-  stor_name: '',
-  bill_status: '10',
-  total_qty: '0',
-  detail_count: '0',
-  bill_type: '',
-  remark: '',
+  bill_code: "",
+  stor_id: "",
+  stor_code: "",
+  stor_name: "",
+  product_code:"A1",
+  bill_status: "10",
+  total_qty: "0",
+  detail_count: "0",
+  bill_type: "",
+  remark: "",
   biz_date: new Date(),
-  out_stor_id: '',
-  create_mode: '',
+  out_stor_id: "",
+  create_mode: "",
   tableData: []
-}
+};
 export default {
-  name: 'AddDialog',
+  name: "AddDialog",
   components: { AddDtl, MaterDialog },
   mixins: [crud(), form(defaultForm)],
   props: {
@@ -211,161 +312,182 @@ export default {
       default: false
     }
   },
-  dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area'],
+  dicts: ["IO_BILL_STATUS", "bill_type", "product_area"],
   data() {
     return {
       dialogVisible: false,
       dtlShow: false,
-      materType: '',
+      materType: "",
       materShow: false,
       flagnow: false,
       nowrow: {},
-      nowindex: '',
+      nowindex: "",
       storlist: [],
       inStorList: [],
       invtypelist: [],
       storId: null,
       rules: {
         product_code: [
-          { required: true, message: '生产区域不能为空', trigger: 'blur' }
+          { required: true, message: "生产区域不能为空", trigger: "blur" }
         ],
         bill_type: [
-          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+          { required: true, message: "业务类型不能为空", trigger: "blur" }
         ],
         biz_date: [
-          { required: true, message: '业务日期不能为空', trigger: 'blur' }
+          { required: true, message: "业务日期不能为空", trigger: "blur" }
         ]
       }
-    }
+    };
   },
   watch: {
     dialogShow: {
       handler(newValue) {
-        this.dialogVisible = newValue
+        this.dialogVisible = newValue;
       }
     }
   },
   methods: {
     open() {
       crudSemiProductIn.queryStor().then(res => {
-        this.storlist = res
-      })
+        this.storlist = res;
+      });
     },
     close() {
-      this.$emit('AddChanged')
+      this.$emit("AddChanged");
     },
     [CRUD.HOOK.beforeSubmit]() {
       if (this.form.tableData.length === 0) {
-        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
+        this.crud.notify("请至少选择一条明细", CRUD.NOTIFICATION_TYPE.INFO);
+        return false;
       }
     },
     [CRUD.HOOK.afterToEdit]() {
-      semiSemiProductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-     /*   for (let i = 0; i < this.form.tableData.length; i++) {
+      semiSemiProductOut
+        .getOutBillDtl({ iostorinv_id: this.form.iostorinv_id })
+        .then(res => {
+          this.form.tableData = res;
+          // 将明细变成不可编辑
+          /*   for (let i = 0; i < this.form.tableData.length; i++) {
           const row = this.form.tableData[i]
           row.edit = false
           this.form.tableData.splice(i, 1, row)
         }*/
-      })
+        });
     },
     [CRUD.HOOK.afterToView]() {
-      semiSemiProductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          row.edit = true
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
+      semiSemiProductOut
+        .getOutBillDtl({ iostorinv_id: this.form.iostorinv_id })
+        .then(res => {
+          this.form.tableData = res;
+          // 将明细变成不可编辑
+          for (let i = 0; i < this.form.tableData.length; i++) {
+            const row = this.form.tableData[i];
+            row.edit = true;
+            this.form.tableData.splice(i, 1, row);
+          }
+        });
     },
     invtypeFormat(row, column) {
-      return this.dict.label.bill_type[row.source_bill_type]
+      return this.dict.label.bill_type[row.source_bill_type];
     },
     storChange(row) {
-      this.storlist.forEach((item) => {
+      this.storlist.forEach(item => {
         if (item.product_code === row) {
-          this.form.product_code = item.product_code
+          this.form.product_code = item.product_code;
         }
-      })
+      });
     },
     async queryMater(index, row) {
-      if (this.form.bill_type === '') {
-        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
+      if (this.form.bill_type === "") {
+        this.crud.notify("请选择业务类型！", CRUD.NOTIFICATION_TYPE.INFO);
+        return;
       }
-      this.materShow = true
-      this.nowindex = index
-      this.nowrow = row
+      this.materShow = true;
+      this.nowindex = index;
+      this.nowrow = row;
     },
     queryDtl(index, row) {
-      if (this.form.bill_type === '') {
-        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
+      if (this.form.bill_type === "") {
+        this.crud.notify("请选择业务类型！", CRUD.NOTIFICATION_TYPE.INFO);
+        return;
       }
-      if (this.form.product_code === '') {
-        this.crud.notify('请选择生产区域！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
+      if (this.form.product_code === "") {
+        this.crud.notify("请选择生产区域！", CRUD.NOTIFICATION_TYPE.INFO);
+        return;
       }
-      this.storId = this.form.product_code
-      this.dtlShow = true
+      this.storId = this.form.product_code;
+      this.dtlShow = true;
     },
     tableChanged5(rows) {
-      rows.forEach((item) => {
-        debugger
+      rows.forEach(item => {
+        debugger;
         if (this.form.tableData.length !== 0) {
-          this.flagnow = false
+          this.flagnow = false;
           for (let i = 0; i < this.form.tableData.length; i++) {
-            if (this.form.tableData[i].material_id === item.material_id && this.form.tableData[i].pcsn === item.pcsn) {
-              this.flagnow = true
+            if (
+              this.form.tableData[i].material_id === item.material_id &&
+              this.form.tableData[i].pcsn === item.pcsn
+            ) {
+              this.flagnow = true;
             }
           }
           if (!this.flagnow) {
-            item.edit = true
-            this.form.tableData.splice(-1, 0, item)
-            this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+            item.edit = true;
+            this.form.tableData.splice(-1, 0, item);
+            this.form.total_qty =
+              parseFloat(this.form.total_qty) + parseFloat(item.plan_qty);
           }
         } else {
-          item.edit = true
-          this.form.tableData.splice(-1, 0, item)
-          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+          item.edit = true;
+          this.form.tableData.splice(-1, 0, item);
+          this.form.total_qty =
+            parseFloat(this.form.total_qty) + parseFloat(item.plan_qty);
         }
-      })
-      this.form.detail_count = this.form.tableData.length
+      });
+      this.form.detail_count = this.form.tableData.length;
     },
     setMaterValue(row) {
       for (let i = 0; i < this.form.tableData.length; i++) {
         if (this.form.tableData[i].material_id === row.material_id) {
-          this.crud.notify('不允许添加相同物料！')
-          return false
+          this.crud.notify("不允许添加相同物料！");
+          return false;
         }
       }
-      this.nowrow.material_id = row.material_id
-      this.nowrow.material_code = row.material_code
-      this.nowrow.material_name = row.material_name
-      this.nowrow.qty_unit_id = row.base_unit_id
-      this.nowrow.qty_unit_name = row.unit_name
-      this.nowrow.plan_qty = '1'
-      this.nowrow.edit = false
-      this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
+      this.nowrow.material_id = row.material_id;
+      this.nowrow.material_code = row.material_code;
+      this.nowrow.material_name = row.material_name;
+      this.nowrow.qty_unit_id = row.base_unit_id;
+      this.nowrow.qty_unit_name = row.unit_name;
+      this.nowrow.plan_qty = "1";
+      this.nowrow.edit = false;
+      this.form.tableData.splice(this.nowindex, 1, this.nowrow); // 通过splice 替换数据 触发视图更新
     },
     async insertdtl() {
-      if (this.form.bill_type === '') {
-        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
+      if (this.form.bill_type === "") {
+        this.crud.notify("请选择业务类型！", CRUD.NOTIFICATION_TYPE.INFO);
+        return;
       }
-      this.form.tableData.push({ material_id: '', material_code: '', material_name: '', pcsn: '', quality_scode: '00', plan_qty: '1', qty_unit_name: '', qty_unit_id: '', remark: '', edit: false })
-      this.form.detail_count = this.form.tableData.length
+      this.form.tableData.push({
+        material_id: "",
+        material_code: "",
+        material_name: "",
+        pcsn: "",
+        quality_scode: "00",
+        plan_qty: "1",
+        qty_unit_name: "",
+        qty_unit_id: "",
+        remark: "",
+        edit: false
+      });
+      this.form.detail_count = this.form.tableData.length;
     },
     deleteRow(index, rows) {
-      this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
-      rows.splice(index, 1)
+      this.form.total_qty =
+        parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty);
+      rows.splice(index, 1);
     }
   }
-}
+};
 </script>
 
 <style>
@@ -379,7 +501,7 @@ export default {
   margin-left: auto;
   padding: 4px 4px;
 }
-.input-with-select  {
+.input-with-select {
   background-color: #fff;
 }
 </style>
diff --git a/mes/qd/src/views/wms/st/semiProductOut/AddDtl.vue b/mes/qd/src/views/wms/st/semiProductOut/AddDtl.vue
index 2c67efa6..9ecbf9de 100644
--- a/mes/qd/src/views/wms/st/semiProductOut/AddDtl.vue
+++ b/mes/qd/src/views/wms/st/semiProductOut/AddDtl.vue
@@ -49,39 +49,74 @@
       :data="crud.data"
       style="width: 100%;"
       border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="instorage_time" label="入库日期" :min-width="flexWidth('instorage_time',crud.data,'入库日期')" />
-      <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-      <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
-      <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_name',crud.data,'物料规格')" />
-      <el-table-column prop="struct_code" label="点位" :min-width="flexWidth('struct_name',crud.data,'点位')" />
-      <el-table-column prop="pcsn" label="订单号" :min-width="flexWidth('pcsn',crud.data,'订单号')" />
-      <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="可用数" />
-      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
+      <el-table-column
+        prop="instorage_time"
+        label="入库日期"
+        :min-width="flexWidth('instorage_time', crud.data, '入库日期')"
+      />
+      <el-table-column
+        prop="material_code"
+        label="物料编码"
+        :min-width="flexWidth('material_code', crud.data, '物料编码')"
+      />
+      <el-table-column
+        prop="material_name"
+        label="物料名称"
+        :min-width="flexWidth('material_name', crud.data, '物料名称')"
+      />
+      <el-table-column
+        prop="material_spec"
+        label="物料规格"
+        :min-width="flexWidth('material_name', crud.data, '物料规格')"
+      />
+      <el-table-column
+        prop="struct_code"
+        label="点位"
+        :min-width="flexWidth('struct_name', crud.data, '点位')"
+      />
+      <el-table-column
+        prop="pcsn"
+        label="订单号"
+        :min-width="flexWidth('pcsn', crud.data, '订单号')"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="plan_qty"
+        :formatter="crud.formatNum3"
+        label="可用数"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="qty_unit_name"
+        label="重量单位"
+      />
     </el-table>
     <!--分页组件-->
     <pagination />
     <span slot="footer" class="dialog-footer">
-      <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
+      <el-button slot="left" type="info" @click="dialogVisible = false"
+        >关闭</el-button
+      >
       <el-button slot="left" type="primary" @click="submit">保存</el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-
-import CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
+import CRUD, { header, presenter } from "@crud/crud";
+import rrOperation from "@crud/RR.operation";
+import pagination from "@crud/Pagination";
 
 export default {
-  name: 'AddDtl',
+  name: "AddDtl",
   components: { rrOperation, pagination },
   cruds() {
     return CRUD({
-      title: '用户', url: 'api/productOut/addDtl',
+      title: "用户",
+      url: "api/semiProductOut/addDtl",
       optShow: {
         add: false,
         edit: false,
@@ -89,10 +124,8 @@ export default {
         reset: true,
         download: false
       },
-      query: {
-
-      }
-    })
+      query: {}
+    });
   },
   mixins: [presenter(), header()],
   props: {
@@ -110,54 +143,53 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      opendtlParam: '',
+      opendtlParam: "",
       rows: [],
       openShow: true
-    }
+    };
   },
   watch: {
     dialogShow: {
       handler(newValue, oldValue) {
-        this.dialogVisible = newValue
+        this.dialogVisible = newValue;
       }
     },
     openParam: {
       handler(newValue, oldValue) {
-        this.opendtlParam = newValue
+        this.opendtlParam = newValue;
       }
     }
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
-      this.crud.query.mater_type = this.opendtlParam
-      this.crud.query.stor_id = this.storId
+      this.crud.query.mater_type = this.opendtlParam;
+      this.crud.query.stor_id = this.storId;
       if (this.openShow) {
-        this.openShow = false
-        return false
+        this.openShow = false;
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     close() {
-      this.crud.resetQuery(false)
+      this.crud.resetQuery(false);
       // 清空grid数据
-      this.crud.data = undefined
-      this.$emit('update:dialogShow', false)
+      this.crud.data = undefined;
+      this.$emit("update:dialogShow", false);
     },
     open() {
-      this.crud.query.mater_type = this.opendtlParam
+      this.crud.query.mater_type = this.opendtlParam;
     },
     submit() {
-      this.rows = this.$refs.multipleTable.selection
+      this.rows = this.$refs.multipleTable.selection;
       if (this.rows.length <= 0) {
-        this.$message('请先勾选物料')
-        return
+        this.$message("请先勾选物料");
+        return;
       }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged', this.rows)
+      this.crud.resetQuery(false);
+      this.$emit("update:dialogShow", false);
+      this.$emit("tableChanged", this.rows);
     }
   }
-}
+};
 </script>
-

From 70e84ce4da74937f81c0e84da7f51127fd7723f6 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 6 Jun 2023 17:20:33 +0800
Subject: [PATCH 02/19] =?UTF-8?q?add=EF=BC=9A=E6=88=90=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../structIvt/StIvtStructivtCpController.java |  13 ++
 .../structIvt/IStIvtStructivtCpService.java   |  10 ++
 .../dao/mapper/StIvtStructivtCpMapper.java    |   3 +
 .../dao/mapper/StIvtStructivtCpMapper.xml     |  40 +++++
 .../service/structIvt/dto/CpIvtQuery.java     |  27 ++++
 .../impl/StIvtStructivtCpServiceImpl.java     |  15 ++
 .../product/productIvt/index.vue              | 150 ++++++++++++++++++
 .../product/productIvt/productivt.js          |  31 ++++
 8 files changed, 289 insertions(+)
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/CpIvtQuery.java
 create mode 100644 mes/qd/src/views/wms/storage_manage/product/productIvt/index.vue
 create mode 100644 mes/qd/src/views/wms/storage_manage/product/productIvt/productivt.js

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java
index 1ca07fcf..90e71582 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java
@@ -2,15 +2,20 @@ package org.nl.wms.storage_manage.productmanage.controller.structIvt;
 
 import io.swagger.annotations.ApiOperation;
 import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.CpIvtQuery;
 import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  * 仓位库存表 前端控制器
@@ -26,6 +31,14 @@ public class StIvtStructivtCpController {
     @Autowired
     private IStIvtStructivtCpService iStIvtStructivtCpService;
 
+
+    @GetMapping
+    @Log("成品库存查询")
+    @ApiOperation("成品库存查询")
+    public ResponseEntity<Object> query(CpIvtQuery query, PageQuery page) {
+        return new ResponseEntity<>(iStIvtStructivtCpService.packageQuery(query,page), HttpStatus.OK);
+    }
+
     @PostMapping("/getStructIvt")
     @Log("查询库存")
     @ApiOperation("查询库存")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
index b89401dd..7a4c8f04 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
@@ -2,7 +2,9 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.CpIvtQuery;
 import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
 
 import java.util.List;
@@ -18,6 +20,13 @@ import java.util.Map;
  */
 public interface IStIvtStructivtCpService extends IService<StIvtStructivtCp> {
 
+
+    /**
+     * 成品库存查询
+     * @param query /
+     */
+    Object packageQuery(CpIvtQuery query, PageQuery page);
+
     /**
      *  成品库存更新
      * @param json
@@ -58,4 +67,5 @@ public interface IStIvtStructivtCpService extends IService<StIvtStructivtCp> {
      * }
      */
     List<Map> getStructIvtMore(StructIvtYLQuery whereJson);
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java
index 8f4dc19a..cd3c9df1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java
@@ -3,7 +3,9 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.CpIvtQuery;
 import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
 
 import java.util.List;
@@ -27,4 +29,5 @@ public interface StIvtStructivtCpMapper extends BaseMapper<StIvtStructivtCp> {
 
     List<Map> getStructIvtMoreBox(JSONObject json);
 
+    List<Map> packageQuery(@Param("query") CpIvtQuery query);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml
index 4c9bf7f5..e44d6174 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml
@@ -138,4 +138,44 @@
         </where>
     </select>
 
+    <select id="packageQuery" resultType="java.util.Map">
+        SELECT
+        attr.stor_name,
+        attr.sect_name,
+        ivt.struct_code,
+        ivt.struct_name,
+        mater.material_name,
+        mater.material_code,
+        attr.storagevehicle_code,
+        ivt.canuse_qty,
+        ivt.frozen_qty,
+        ivt.ivt_qty,
+        ivt.warehousing_qty,
+        unit.unit_name,
+        ivt.instorage_time
+        FROM
+        st_ivt_structivt_cp ivt
+        LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id
+        LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id
+        LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
+        <where>
+            1=1
+            <if test="query.material_code!= null and query.material_code != ''">
+                and mater.material_code LIKE #{query.material_code} or
+                (mater.material_name LIKE #{query.material_code})
+            </if>
+            <if test="query.struct_code!= null and query.struct_code != ''">
+                and attr.struct_code LIKE #{query.struct_code} or
+                (attr.struct_name LIKE #{query.struct_code})
+            </if>
+            <if test="query.start_time!= null and query.start_time != ''">
+                and ivt.instorage_time &gt;= #{query.start_time}
+            </if>
+            <if test="query.end_time!= null and query.end_time != ''">
+                and ivt.instorage_time &lt;= #{query.end_time}
+            </if>
+        </where>
+        order by ivt.instorage_time DESC,attr.struct_code ASC
+    </select>
+
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/CpIvtQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/CpIvtQuery.java
new file mode 100644
index 00000000..e02b21b9
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/CpIvtQuery.java
@@ -0,0 +1,27 @@
+package org.nl.wms.storage_manage.productmanage.service.structIvt.dto;
+
+import lombok.Data;
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.common.domain.query.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp;
+
+/*
+ * @author LXY
+ * @Date 2023/5/4 19:49
+ */
+@Data
+public class CpIvtQuery extends BaseQuery<StIvtStructivtCp> {
+
+
+    private String struct_code;
+
+    private String material_code;
+
+    @Override
+    public void paramMapping() {
+        super.doP.put("struct_code", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build());
+    }
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
index 78a2a1ba..3da06584 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
@@ -6,6 +6,10 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.IdUtil;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
@@ -17,11 +21,13 @@ import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper.StIvtStructivtCpMapper;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.CpIvtQuery;
 import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil;
 import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -48,6 +54,15 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl<StIvtStructivtCpMap
     @Autowired
     protected IMdPbBucketrecordService iMdPbBucketrecordService; // 包装箱记录表服务
 
+    @Override
+    public Object packageQuery(CpIvtQuery query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
+        TableDataInfo build = TableDataInfo.build(this.baseMapper.packageQuery(query));
+        build.setTotalElements(page.getTotal());
+
+        return build;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void UpdateIvt(JSONObject json) {
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIvt/index.vue b/mes/qd/src/views/wms/storage_manage/product/productIvt/index.vue
new file mode 100644
index 00000000..298a9b4a
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/product/productIvt/index.vue
@@ -0,0 +1,150 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="入库日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="仓位">
+            <el-input
+              v-model="query.struct_code"
+              size="mini"
+              clearable
+              placeholder="仓位"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="物料">
+            <el-input
+              v-model="query.material_code"
+              size="mini"
+              clearable
+              placeholder="仓位"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission"/>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column show-overflow-tooltip prop="stor_name" label="仓库名称" />
+        <el-table-column show-overflow-tooltip prop="sect_name" label="库区名称" />
+        <el-table-column show-overflow-tooltip prop="struct_code" label="仓位编码" />
+        <el-table-column show-overflow-tooltip prop="struct_name" label="仓位名称" />
+        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
+        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
+        <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
+        <el-table-column show-overflow-tooltip prop="canuse_qty" label="可用数量" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="frozen_qty" label="冻结数量" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="ivt_qty" label="库存数量" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="warehousing_qty" label="待入数量" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
+        <el-table-column show-overflow-tooltip prop="instorage_time" label="入库时间" min-width="150" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
+import ProductIvt from '@/views/wms/storage_manage/product/productIvt/productivt'
+
+export default {
+  name: 'ProductIn',
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '成品库存',
+      optShow: { add: false, reset: true },
+      idField: 'stockrecord_id',
+      url: '/api/stIvtStructivtCp',
+      crudMethod: { ...ProductIvt }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      storlist: [],
+      storId: null
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIvt/productivt.js b/mes/qd/src/views/wms/storage_manage/product/productIvt/productivt.js
new file mode 100644
index 00000000..bd560a4d
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/product/productIvt/productivt.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/stIvtStructivtCp',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/stIvtStructivtCp/delete',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/stIvtStructivtCp/update',
+    method: 'post',
+    data
+  })
+}
+
+export default {
+  add,
+  edit,
+  del
+}

From 4fed94c420c8f6ecf6ba431c8a96bb70aae5bbb6 Mon Sep 17 00:00:00 2001
From: jiaoliming <dawnjiao@foxmail.com>
Date: Tue, 6 Jun 2023 17:24:29 +0800
Subject: [PATCH 03/19] fix:

---
 .../org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index 42e51f16..cbcbf7b8 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -711,6 +711,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 if (code.equals("to_start_checking")) {
                     hailiangAutoCacheLineDeviceDriver.writing("to_task", "1001");
                 }
+                if (code.equals("to_check_finish")){
+                    hailiangAutoCacheLineDeviceDriver.writing("to_task", "0");
+                }
             }
         }
         JSONObject resultJson = new JSONObject();

From ee2b98ff01d635b99bd2332169bbdd768e2505c4 Mon Sep 17 00:00:00 2001
From: jiaoliming <dawnjiao@foxmail.com>
Date: Tue, 6 Jun 2023 17:27:03 +0800
Subject: [PATCH 04/19] Revert "fix:"

This reverts commit 4fed94c420c8f6ecf6ba431c8a96bb70aae5bbb6.
---
 .../org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index cbcbf7b8..42e51f16 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -711,9 +711,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 if (code.equals("to_start_checking")) {
                     hailiangAutoCacheLineDeviceDriver.writing("to_task", "1001");
                 }
-                if (code.equals("to_check_finish")){
-                    hailiangAutoCacheLineDeviceDriver.writing("to_task", "0");
-                }
             }
         }
         JSONObject resultJson = new JSONObject();

From ce9e6e80a88b5b13e93c20930dbbbad4ee7c374f Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Tue, 6 Jun 2023 17:31:00 +0800
Subject: [PATCH 05/19] =?UTF-8?q?rev=20=E7=BC=93=E5=AD=98=E7=BA=BF?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HailiangAutoCacheLineDeviceDriver.java       | 16 ++++++++--------
 .../wms/service/impl/AcsToWmsServiceImpl.java    |  8 ++++----
 .../wms/service/impl/WmsToAcsServiceImpl.java    |  2 +-
 .../instruction/service/InstructionService.java  |  2 +-
 .../service/impl/InstructionServiceImpl.java     | 12 ++++++------
 .../nl/modules/quartz/task/AutoCreateInst.java   |  6 +++---
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java
index 0bbb62ac..9131d938 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java
@@ -477,7 +477,7 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
             } else if (agvphase == 0x0C || agvphase == 0x23) {
                 //agv送满框1完毕或送满框2完毕
                 //需要判断缓存线工作模式联机，对接位有货，任务号不为0，对接位条码正常才反馈agv以及电气放货完成
-                if (mode == 1 && in_finish == 1 && task != 0 && docking_barcode != 0 && error != 35 && ObjectUtil.isNotEmpty(inst) && Integer.parseInt(inst.getInstruction_code()) == task) {
+                if (mode == 1 && task != 0 && docking_barcode != 0 && error != 34 && ObjectUtil.isNotEmpty(inst) && Integer.parseInt(inst.getInstruction_code()) == task) {
                     if (inst != null) {
                         TaskDto taskDto = taskserver.findByCodeFromCache(inst.getTask_code());
                         if (taskDto != null) {
@@ -504,9 +504,9 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
                     if (prepare_ready != 1) {
                         noFeedMessage += "准备位未就绪,";
                     }
-                    if (in_ready != 1) {
-                        noFeedMessage += "对接位入箱未就绪,";
-                    }
+//                    if (in_ready != 1) {
+//                        noFeedMessage += "对接位入箱未就绪,";
+//                    }
                     if (error == 35) {
                         noFeedMessage += "准备位条码异常,";
                     }
@@ -672,7 +672,7 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
                 }
             } else if (agvphase == 0x15 || agvphase == 0x19) {
                 //缓存线出满框送回空框完毕
-                if (mode == 1 && in_finish == 1 && ObjectUtil.isNotEmpty(inst)) {
+                if (mode == 1 && docking_barcode > 0 && error != 34 && ObjectUtil.isNotEmpty(inst)) {
                     this.writing("to_agv_put_finish", "1");
                     inst.setExecute_status(InstActionEnum.EXECUTE_PUT_EMPTY_FINISH.getCode());
                     instructionService.update(inst);
@@ -687,9 +687,9 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
                     this.set(0, 0, null);
                 } else {
                     String noFeedMessage = this.noFeedMessage();
-                    if (in_finish != 1) {
-                        noFeedMessage += "电气未上报对接位入箱完成,";
-                    }
+//                    if (in_finish != 1) {
+//                        noFeedMessage += "电气未上报对接位入箱完成,";
+//                    }
                     this.noFeedAgvMessage = this.replace(noFeedMessage);
                 }
             }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
index 8662c999..1baa27bc 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
@@ -36,10 +36,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     @Override
     public HttpResponse applyTaskToWms(JSONObject param) {
-        log.info("acs开始向mes请求任务,请求参数:{}", JSON.toJSONString(param));
         try {
             MDC.put(log_file_type, log_type);
             if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
+                log.info("acs开始向mes请求任务,请求参数:{}", JSON.toJSONString(param));
                 String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue();
                 AddressDto addressDto = addressService.findByCode("applyTaskToWms");
                 String url = wmsurl + addressDto.getMethods_url();
@@ -203,10 +203,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     @Override
     public HttpResponse applyScannerTask(JSONObject map) {
-        log.info("acs开始向mes申请扫码器任务,请求参数:{}", JSON.toJSONString(map));
         try {
             MDC.put(log_file_type, log_type);
             if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
+                log.info("acs开始向mes申请扫码器任务,请求参数:{}", JSON.toJSONString(map));
                 String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue();
                 AddressDto addressDto = addressService.findByCode("applyScannerTask");
                 String methods_url = addressDto.getMethods_url();
@@ -230,10 +230,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     @Override
     public HttpResponse feedCacheLineBarcodes(JSONObject map) {
-        log.info("acs开始向mes反馈缓存线条码,请求参数:{}", JSON.toJSONString(map));
         try {
             MDC.put(log_file_type, log_type);
             if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
+                log.info("acs开始向mes反馈缓存线条码,请求参数:{}", JSON.toJSONString(map));
                 String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue();
                 AddressDto addressDto = addressService.findByCode("feedCacheLineBarcodes");
                 String methods_url = addressDto.getMethods_url();
@@ -257,10 +257,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     @Override
     public HttpResponse feedCacheLineTask(JSONObject param) {
-        log.info("acs开始向mes反馈缓存线任务号,请求参数:{}", JSON.toJSONString(param));
         try {
             MDC.put(log_file_type, log_type);
             if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
+                log.info("acs开始向mes反馈缓存线任务号,请求参数:{}", JSON.toJSONString(param));
                 String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue();
                 AddressDto addressDto = addressService.findByCode("feedCacheLineTask");
                 String methods_url = addressDto.getMethods_url();
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index 42e51f16..aa11aa2f 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -710,7 +710,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 hailiangAutoCacheLineDeviceDriver.writing(code, value);
                 if (code.equals("to_start_checking")) {
                     hailiangAutoCacheLineDeviceDriver.writing("to_task", "1001");
-                }
+                } 
             }
         }
         JSONObject resultJson = new JSONObject();
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
index 8f481493..b0622e69 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
@@ -349,5 +349,5 @@ public interface InstructionService {
      */
     void removeCacheLinePhase(Instruction dto);
 
-    Instruction findInstByPutDeviceCode(String put_device_code);
+    Instruction findInstByDeviceCode(String device_code);
 }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index e06f704c..933917e0 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -1333,8 +1333,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
             if (putDevice != null) {
                 if (startDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
                     hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) startDevice.getDeviceDriver();
-                    if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0) {
-                        throw new BadRequestException("缓存线已存在任务,稍后下发!");
+                    if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0 || !hailiangAutoCacheLineDeviceDriver.getIsonline()) {
+                        throw new BadRequestException("缓存线已存在任务或设备不在线,稍后下发!");
                     } else if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") == 0) {
                         //下发电气单出
                         to_task_type = "4";
@@ -1348,8 +1348,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
                 }
                 if (putDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
                     hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) putDevice.getDeviceDriver();
-                    if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0) {
-                        throw new BadRequestException("缓存线已存在任务,稍后下发!");
+                    if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0 || !hailiangAutoCacheLineDeviceDriver.getIsonline()) {
+                        throw new BadRequestException("缓存线已存在任务或设备不在线,稍后下发!");
                     } else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") == 0) {
                         //下发电气单入
                         to_task_type = "2";
@@ -1450,12 +1450,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
     }
 
     @Override
-    public Instruction findInstByPutDeviceCode(String put_device_code) {
+    public Instruction findInstByDeviceCode(String device_code) {
         return Optional
                 .ofNullable(this.instructions)
                 .orElse(new CopyOnWriteArrayList<>())
                 .stream()
-                .filter(i -> i.getPut_device_code().equals(put_device_code))
+                .filter(i -> i.getPut_device_code().equals(device_code) || i.getStart_device_code().equals(device_code) || i.getNext_device_code().equals(device_code))
                 .findFirst()
                 .orElse(null);
     }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
index 4548932b..c362fb3d 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
@@ -94,7 +94,7 @@ public class AutoCreateInst {
                     Device device = deviceAppService.findDeviceByCode(put_device_code);
                     if (device != null && device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
                         hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) device.getDeviceDriver();
-                        if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) {
+                        if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(put_device_code) != null) {
                             continue;
                         }
                     }
@@ -105,7 +105,7 @@ public class AutoCreateInst {
                     Device device = deviceAppService.findDeviceByCode(start_device_code);
                     if (device != null && device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
                         hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) device.getDeviceDriver();
-                        if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) {
+                        if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(start_device_code) != null) {
                             continue;
                         }
                     }
@@ -143,7 +143,7 @@ public class AutoCreateInst {
                     Device device = deviceAppService.findDeviceByCode(taskDto1.getPut_device_code());
                     if (device != null && device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
                         hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) device.getDeviceDriver();
-                        if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) {
+                        if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(taskDto1.getPut_device_code()) != null) {
                             continue;
                         }
                     }

From 1d52b58d6a4231e3b90180e6934657113fcd4e25 Mon Sep 17 00:00:00 2001
From: jiaoliming <dawnjiao@foxmail.com>
Date: Tue, 6 Jun 2023 17:38:15 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=20fix=EF=BC=9A=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B8=85=E9=99=A4=E4=BB=BB=E5=8A=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
---
 .../org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index aa11aa2f..cbcbf7b8 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -710,7 +710,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 hailiangAutoCacheLineDeviceDriver.writing(code, value);
                 if (code.equals("to_start_checking")) {
                     hailiangAutoCacheLineDeviceDriver.writing("to_task", "1001");
-                } 
+                }
+                if (code.equals("to_check_finish")){
+                    hailiangAutoCacheLineDeviceDriver.writing("to_task", "0");
+                }
             }
         }
         JSONObject resultJson = new JSONObject();

From 29012daacdf7c545f282e1adcd360d9d23e17c2d Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Tue, 6 Jun 2023 19:33:09 +0800
Subject: [PATCH 07/19] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E6=B7=B1=E5=9D=91?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=89=A9=E6=96=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/common/domain/query/PageQuery.java | 11 ++---
 .../java/org/nl/common/enums/AcsTaskEnum.java |  2 +
 .../org/nl/config/mybatis/CodeGenerator.java  |  4 +-
 .../PdmBiPersoncorrdeviceController.java      | 21 ++++++++++
 .../IPdmBiPersoncorrdeviceService.java        | 16 ++++++++
 .../userdevice/dao/PdmBiPersoncorrdevice.java | 34 +++++++++++++++
 .../mapper/PdmBiPersoncorrdeviceMapper.java   | 16 ++++++++
 .../xml/PdmBiPersoncorrdeviceMapper.xml       |  5 +++
 .../PdmBiPersoncorrdeviceServiceImpl.java     | 20 +++++++++
 .../device/SpecialDeviceController.java       | 30 ++++++--------
 .../ProduceshiftorderController.java          |  8 ++++
 .../IPdmProduceWorkorderService.java          |  3 +-
 .../impl/IPdmProduceWorkorderServiceImpl.java | 41 ++++++++-----------
 .../resources/config/application-dev3.yml     |  5 ++-
 .../product_manage/workorder/UploadDialog.vue |  2 +-
 .../wms/scheduler_manage/scheduler/index.vue  |  2 +-
 16 files changed, 164 insertions(+), 56 deletions(-)
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java
index 61e88cc9..cf0af3b1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java
@@ -45,15 +45,15 @@ public class PageQuery implements Serializable {
     /**
      * 当前记录起始索引 默认值
      */
-    public static final int DEFAULT_PAGE_NUM = 1;
+    public static final int DEFAULT_PAGE_NUM = 0;
 
     /**
      * 每页显示记录数 默认值 默认查全部
      */
-    public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
+    public static final int DEFAULT_PAGE_SIZE = 10;
 
     public <T> Page<T> build() {
-        Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM) + 1;
+        Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM);
         Integer pageSize = ObjectUtil.defaultIfNull(getSize(), DEFAULT_PAGE_SIZE);
         if (pageNum <= 0) {
             pageNum = DEFAULT_PAGE_NUM;
@@ -75,10 +75,7 @@ public class PageQuery implements Serializable {
     public <R,T> Page<T> build(Class<R> r) {
         Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM);
         Integer pageSize = ObjectUtil.defaultIfNull(getSize(), DEFAULT_PAGE_SIZE);
-        if (pageNum <= 0) {
-            pageNum = DEFAULT_PAGE_NUM;
-        }
-        Page<T> page = new Page<>(pageNum, pageSize);
+        Page<T> page = new Page<>(pageNum+1, pageSize);
         if (StringUtils.isNotBlank(sort)){
             String[] split = sort.split(",");
             for (int i = 0; i < (split.length & ~1); i=i+2) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java
index f575be13..c8a3f919 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java
@@ -58,7 +58,9 @@ public enum AcsTaskEnum {
     ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"),
     ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"),
     ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"),
+
     ACS_TASK_TYPE_NOBLE_POINT_POINT_TASK("5","诺宝点对点任务"),
+
     ACS_TASK_TYPE_WEIGHING_TASK_OF_PS20("6","PS20称重任务（刻字-包装）"),
     ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20("7","PS20不称重任务（刻字-包装）"),
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java
index 960f43a4..91d8e99a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java
@@ -57,10 +57,10 @@ public class CodeGenerator {
         mpg.setGlobalConfig(gc);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://192.168.81.252:3306/hl_one_mes_xc?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://192.168.46.5:3306/hl_one_mes_test?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("Root.123456");
+        dsc.setPassword("123456");
         mpg.setDataSource(dsc);
         // 包配置
         PackageConfig pc = new PackageConfig();
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java
new file mode 100644
index 00000000..f0853c09
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java
@@ -0,0 +1,21 @@
+package org.nl.wms.device_manage.controller.userdevice;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 人员设备关系表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@RestController
+@RequestMapping("/pdmBiPersoncorrdevice")
+public class PdmBiPersoncorrdeviceController {
+
+}
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java
new file mode 100644
index 00000000..559e3fd2
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.device_manage.service.userdevice;
+
+import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 人员设备关系表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+public interface IPdmBiPersoncorrdeviceService extends IService<PdmBiPersoncorrdevice> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java
new file mode 100644
index 00000000..077276b5
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java
@@ -0,0 +1,34 @@
+package org.nl.wms.device_manage.service.userdevice.dao;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 人员设备关系表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("pdm_bi_personcorrdevice")
+public class PdmBiPersoncorrdevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private String user_id;
+
+    /**
+     * 设备标识
+     */
+    private String device_code;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java
new file mode 100644
index 00000000..ce8c5c96
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.device_manage.service.userdevice.dao.mapper;
+
+import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 人员设备关系表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+public interface PdmBiPersoncorrdeviceMapper extends BaseMapper<PdmBiPersoncorrdevice> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml
new file mode 100644
index 00000000..f0e0fc83
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdeviceMapper">
+
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java
new file mode 100644
index 00000000..bc9ebd44
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.device_manage.service.userdevice.impl;
+
+import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
+import org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdeviceMapper;
+import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 人员设备关系表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@Service
+public class PdmBiPersoncorrdeviceServiceImpl extends ServiceImpl<PdmBiPersoncorrdeviceMapper, PdmBiPersoncorrdevice> implements IPdmBiPersoncorrdeviceService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
index cb21270e..18519171 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
@@ -23,6 +23,7 @@ import org.nl.wms.product_manage.备份pdm.service.DeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,26 +44,21 @@ public class SpecialDeviceController {
     @Autowired
     private IPdmBiDeviceService iDeviceService;
 
-    @PostMapping("/query")
+    @GetMapping("/query")
     @ApiOperation("查询生产设备")
     @SaIgnore
-    public ResponseEntity<Object> query(@RequestBody DeviceQuery query) {
-        List<PdmBiDevice> list = iDeviceService.list(query.build());
-        Set<String> materials = list.stream().map(PdmBiDevice::getMaterial_id).collect(Collectors.toSet());
-        Map<String, MdMeMaterialbase> materialMap = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().in("material_id", materials)).stream().collect(HashMap::new, (k, v) -> k.put(v.getMaterial_id(), v), HashMap::putAll);
-        List<Map> result = new ArrayList<>();
-        for (PdmBiDevice pdmBiDevice : list) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("device_code",pdmBiDevice.getDevice_code());
-            map.put("product_area",pdmBiDevice.getProduct_area());
-            map.put("material_id",pdmBiDevice.getMaterial_id());
-            MdMeMaterialbase materialbase = materialMap.get("pdmBiDevice.getMaterial_id()");
-            map.put("material_name",materialbase!=null?materialbase.getMaterial_name():"");
-            map.put("material_spec",materialbase!=null?materialbase.getMaterial_spec():"");
-            map.put("deviceinstor_qty",pdmBiDevice.getDeviceinstor_qty());
-            result.add(map);
+    public ResponseEntity<Object> query(DeviceQuery query,PageQuery page) {
+        Page<Map<String, Object>> list = iDeviceService.pageMaps(page.build(PdmBiDevice.class), query.build());
+        if (!CollectionUtils.isEmpty(list.getRecords())){
+            Set materials = list.getRecords().stream().map(a->a.get("material_id")).collect(Collectors.toSet());
+            Map<String, MdMeMaterialbase> materialMap = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().in("material_id", materials)).stream().collect(HashMap::new, (k, v) -> k.put(v.getMaterial_id(), v), HashMap::putAll);
+            for (Map pdmBiDevice : list.getRecords()) {
+                MdMeMaterialbase materialbase = materialMap.get(pdmBiDevice.get("material_id"));
+                pdmBiDevice.put("material_name",materialbase!=null?materialbase.getMaterial_name():"");
+                pdmBiDevice.put("material_spec",materialbase!=null?materialbase.getMaterial_spec():"");
+            }
         }
-        return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
     }
 
     @PostMapping("/update")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
index 39a97d37..1be3d857 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
@@ -108,6 +108,14 @@ public class ProduceshiftorderController{
      public ResponseEntity<Object> saveReport(@RequestBody JSONObject param) {
           return new ResponseEntity<>(iPdmProduceWorkorderService.report(param), HttpStatus.OK);
      }
+     @PostMapping("/unqualReport")
+     @Log("工单不合格报工")
+     @ApiOperation("工单不合格报工")
+     public ResponseEntity<Object> unqualReport(@RequestBody JSONObject param) {
+          iPdmProduceWorkorderService.unqualReport(param);
+          return new ResponseEntity<>(HttpStatus.OK);
+     }
+
 
      @PostMapping("/finish")
      @Log("看板强制完成")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
index f64326d4..d3f3f26d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
@@ -108,12 +108,13 @@ public interface IPdmProduceWorkorderService extends IService<PdmProduceWorkorde
     Object openStart(JSONObject param);
 
     /**
-     * 开工操作
+     * 报工操作
      *包含3个字段
      * @param param 请求参数
      * @return
      */
     Object report(JSONObject param);
+    void unqualReport(JSONObject param);
 
     void reportApprove(JSONArray param);
     void updateReport(JSONObject param);
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 3b58d7ee..2c4cecd0 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
@@ -56,6 +56,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -232,7 +233,6 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         }
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
-
         // 1.获取上传文件输入流
         InputStream inputStream = null;
         try {
@@ -240,7 +240,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         } catch (Exception e) {
             e.printStackTrace();
         }
-
+        ExcelReader reader = ExcelUtil.getReader(inputStream);
         // 调用用 hutool 方法读取数据 调用第一个sheet白班数据
         ExcelReader excelReader = ExcelUtil.getReader(inputStream, 0);
         // 从第1行开始获取数据   excelReader.read的结果是一个2纬的list，外层是行，内层是行对应的所有列
@@ -588,20 +588,17 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
     @Override
     @Transactional
     public Object report(JSONObject param) {
-        Assert.notNull(new Object[]{param, param.get("report_qty"), param.get("nok_qty"), param.getBigDecimal("repare_qty")}, "请求参数不能为空");
+        Assert.notNull(new Object[]{param, param.get("report_qty"),param.getString("workorder_id")}, "请求参数不能为空");
 
         PdmProduceWorkorder workorder = this.getOne(new QueryWrapper<PdmProduceWorkorder>().eq("workorder_id", param.getString("workorder_id")));
 //        if (workorder.getWorkorder_status().equals(WorkerOrderEnum.COMPLETE.getCode()) || workorder.getWorkorder_status().equals(WorkerOrderEnum.FORCE_COMPLETE.getCode())) {
 //            throw new BadRequestException(param.getString("workorder_id") + "当前工单已经完工不允许报工");
 //        }
+        Assert.notNull(workorder,"当前工单不存在");
         PdmProduceWorkorderrecord one = reportRecordService.getOne(new QueryWrapper<PdmProduceWorkorderrecord>()
                 .eq("workorder_id", param.getString("workorder_id")).eq("report_status", ReportEnum.REPORT_STATUS.code("生成")));
-        if (one == null) {
-            throw new BadRequestException(param.getString("workorder_id") + "当前工单没有生成状态的报工记录");
-        }
+        Assert.notNull(one,param.getString("workorder_id") + "当前工单没有生成状态的报工记录");
         workorder.setReport_qty(workorder.getReport_qty().add(param.getBigDecimal("report_qty")));
-        workorder.setNok_qty(workorder.getReport_qty().add(param.getBigDecimal("nok_qty")));
-        workorder.setRepare_qty(workorder.getReport_qty().add(param.getBigDecimal("repare_qty")));
         if (workorder.getPlan_qty().doubleValue() <= workorder.getReport_qty().doubleValue()) {
             workorder.setWorkorder_status(WorkerOrderEnum.COMPLETE.getCode());
         }
@@ -609,14 +606,22 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         this.updateById(workorder);
         reportRecordService.update(new UpdateWrapper<PdmProduceWorkorderrecord>()
                 .set("report_qty", param.getBigDecimal("report_qty"))
-                .set("nok_qty", param.getBigDecimal("nok_qty"))
-                .set("repare_qty", param.getBigDecimal("repare_qty"))
                 .set("report_status", ReportEnum.REPORT_STATUS.code("报工"))
                 .set("needproduct_qty", Math.max(0,workorder.getPlan_qty().intValue() - workorder.getReport_qty().intValue()))
                 .eq("macoperate_id", one.getMacoperate_id()));
         return one.getMacoperate_id();
     }
 
+    @Override
+    public void unqualReport(JSONObject param) {
+        Assert.notNull(new Object[]{param, param.get("report_qty"),param.getString("workorder_id")}, "请求参数不能为空");
+        PdmProduceWorkorder workorder = this.getOne(new QueryWrapper<PdmProduceWorkorder>().eq("workorder_id", param.getString("workorder_id")));
+        Assert.notNull(workorder,"当前工单不存在");
+        workorder.setRepare_qty(param.getBigDecimal("nok_qty"));
+        workorder.setRepare_qty(param.getBigDecimal("repare_qty"));
+        workorder.setReal_qty(null);
+        this.updateById(workorder);
+    }
 
     @Override
     @Transactional
@@ -647,23 +652,9 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
     private List<Map> packageWorkorderQty(List<PdmProduceWorkorderrecord> record, List<PdmProduceWorkorderrecord> itemRecord) {
         List<String> ids = itemRecord.stream().map(PdmProduceWorkorderrecord::getMacoperate_id).collect(Collectors.toList());
         List<PdmProduceWorkorderrecord> oldRecord = record.stream().filter(item -> ids.contains(item.getMacoperate_id())).collect(Collectors.toList());
-        long old_nok_qty = oldRecord.stream().mapToLong(a->a.getNok_qty().longValue()).sum();
-        long new_nok_qty = itemRecord.stream().mapToLong(a->a.getNok_qty().longValue()).sum();
-        long old_repare_qty = oldRecord.stream().mapToLong(a->a.getRepare_qty().longValue()).sum();
-        long new_repare_qty = itemRecord.stream().mapToLong(a->a.getRepare_qty().longValue()).sum();
         long old_report_qty = oldRecord.stream().mapToLong(a->a.getReport_qty().longValue()).sum();
         long new_report_qty = itemRecord.stream().mapToLong(a->a.getReport_qty().longValue()).sum();
-           List<Map> list = new ArrayList<>();
-        Map<String, Object> nok_qty = new HashMap<>();
-        nok_qty.put("field", "nok_qty");
-        nok_qty.put("value", Math.abs(new_nok_qty - old_nok_qty));
-        nok_qty.put("add", new_nok_qty > old_nok_qty);
-        list.add(nok_qty);
-        Map<String, Object> repare_qty = new HashMap<>();
-        repare_qty.put("field", "repare_qty");
-        repare_qty.put("value", Math.abs(new_repare_qty - old_repare_qty));
-        repare_qty.put("add", new_repare_qty > old_repare_qty);
-        list.add(repare_qty);
+        List<Map> list = new ArrayList<>();
         Map<String, Object> report_qty = new HashMap<>();
         report_qty.put("field", "report_qty");
         report_qty.put("value", Math.abs(new_report_qty - old_report_qty));
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
index 4a195bc6..934d0dbd 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
@@ -23,10 +23,11 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      #      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       #      password: ${DB_PWD:123456}
-      password: ${DB_PWD:942464Yy}
+      password: ${DB_PWD:123456}
 
       # 初始连接数
       initial-size: 5
diff --git a/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue
index da5672f9..d7526503 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import crudProduceshiftorder from '@/views/wms/product_manage/workorder'
+import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
 import CRUD, { crud } from '@crud/crud'
 
 export default {
diff --git a/mes/qd/src/views/wms/scheduler_manage/scheduler/index.vue b/mes/qd/src/views/wms/scheduler_manage/scheduler/index.vue
index a964cb3a..52a3b1b6 100644
--- a/mes/qd/src/views/wms/scheduler_manage/scheduler/index.vue
+++ b/mes/qd/src/views/wms/scheduler_manage/scheduler/index.vue
@@ -52,7 +52,7 @@
         @current-change="handleCurrentChange"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column show-overflow-tooltip prop="material_spec" label="物料系列" />
+        <el-table-column show-overflow-tooltip prop="rule_code" label="物料系列" />
         <el-table-column show-overflow-tooltip prop="process_id" label="工序调度编号" />
         <el-table-column show-overflow-tooltip prop="process_name" label="工序调度名称" />
         <el-table-column

From a68d2e323e64a4f9e5ee1442418a4e44aa213a3b Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 7 Jun 2023 17:18:45 +0800
Subject: [PATCH 08/19] =?UTF-8?q?rev:=E5=B7=A5=E5=8D=95=E5=AF=BC=E5=85=A5/?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=BA=BF=E7=89=A9=E6=96=99=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/hd/nladmin-system/pom.xml                 |  22 +-
 .../service/impl/LocalStorageServiceImpl.java |   9 +-
 .../PdmBiPersoncorrdeviceController.java      |  21 -
 .../PersoncorrdeviceController.java           |  49 ++-
 .../IPdmBiPersoncorrdeviceService.java        |  67 +++
 .../userdevice/dao/PdmBiPersoncorrdevice.java |   3 +
 .../mapper/PdmBiPersoncorrdeviceMapper.java   |   4 +
 .../xml/PdmBiPersoncorrdeviceMapper.xml       |   3 +
 .../PdmBiPersoncorrdeviceServiceImpl.java     |  68 +++
 .../wms/ext/sap/rest/WmsToSapController.java  |   3 +
 .../sch/tasks/SpeMachinery/SpeFullTask.java   |   4 +
 .../IPdmProduceWorkorderService.java          |   1 +
 .../impl/IPdmProduceWorkorderServiceImpl.java | 402 ++++++------------
 .../resources/config/application-dev3.yml     |   6 +-
 .../deviceMaterial/deviceMaterial.js          |  19 +
 .../device_manage/deviceMaterial/index.vue    | 146 +++++++
 .../device_manage/userDeviceReplate/index.vue | 293 +++++++++++++
 .../device_manage/userDeviceReplate/role.js   |  57 +++
 18 files changed, 843 insertions(+), 334 deletions(-)
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{mps/rest => device_manage/controller/userdevice}/PersoncorrdeviceController.java (69%)
 create mode 100644 mes/qd/src/views/wms/device_manage/deviceMaterial/deviceMaterial.js
 create mode 100644 mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
 create mode 100644 mes/qd/src/views/wms/device_manage/userDeviceReplate/index.vue
 create mode 100644 mes/qd/src/views/wms/device_manage/userDeviceReplate/role.js

diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml
index b27f32c6..6fa1e7f7 100644
--- a/mes/hd/nladmin-system/pom.xml
+++ b/mes/hd/nladmin-system/pom.xml
@@ -27,7 +27,23 @@
 <!--        <jna.version>5.8.0</jna.version>-->
         <configuration.version>1.9</configuration.version>
     </properties>
+
     <dependencies>
+        <dependency>
+            <artifactId>poi</artifactId>-->
+            <groupId>org.apache.poi</groupId>
+            <version>4.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>4.0.0</version>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
         <dependency>
             <groupId>org.jetbrains</groupId>
@@ -364,12 +380,6 @@
             <version>0.1.55</version>
         </dependency>
 
-        <!--  导入Excel相关-->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>2.2.6</version>
-        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java
index c5ef87d3..73d35fc0 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java
@@ -21,9 +21,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
-import org.nl.common.utils.SecurityUtils;
+import lombok.RequiredArgsConstructor;
 import org.nl.modules.common.config.FileProperties;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.*;
@@ -146,12 +144,7 @@ public class LocalStorageServiceImpl implements LocalStorageService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void importExcel(String path) {
-        WQLObject measureunitTab = WQLObject.getWQLObject("md_pb_measureunit");
-        WQLObject materialbaseTab = WQLObject.getWQLObject("md_me_materialbase");
-        String currentUserId = SecurityUtils.getCurrentUserId();
-        String nickName = SecurityUtils.getCurrentNickName();
 
-        //List<Map<String, Object>> listMap = EasyExcel.read(path).sheet(1).doReadSync();
         List<Map<String, Object>> listMap = new ArrayList<>();
         for (int i = 3; i < listMap.size(); i++) {
             Map<String, Object> map = listMap.get(i);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java
deleted file mode 100644
index f0853c09..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PdmBiPersoncorrdeviceController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.nl.wms.device_manage.controller.userdevice;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 人员设备关系表 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-06-06
- */
-@RestController
-@RequestMapping("/pdmBiPersoncorrdevice")
-public class PdmBiPersoncorrdeviceController {
-
-}
-
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/PersoncorrdeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java
similarity index 69%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/PersoncorrdeviceController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java
index 61259398..272be715 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/PersoncorrdeviceController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java
@@ -1,13 +1,21 @@
 
-package org.nl.wms.mps.rest;
+package org.nl.wms.device_manage.controller.userdevice;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.jsonwebtoken.lang.Assert;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
+import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.IdUtil;
+import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService;
+import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
 import org.nl.wms.mps.service.PersoncorrdeviceService;
 import org.nl.wms.mps.service.dto.PersoncorrdeviceDto;
 import org.springframework.data.domain.Pageable;
@@ -16,6 +24,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,50 +40,43 @@ import java.util.Map;
 public class PersoncorrdeviceController {
 
     private final PersoncorrdeviceService personcorrdeviceService;
+    private final IPdmBiPersoncorrdeviceService pdmBiPersoncorrdeviceService;
 
     @GetMapping
     @Log("查询人员设备维护")
     @ApiOperation("查询人员设备维护")
-    //@PreAuthorize("@el.check('personcorrdevice:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(personcorrdeviceService.queryAll(whereJson,page),HttpStatus.OK);
+    public ResponseEntity<Object> query(@RequestParam Map query, PageQuery page){
+        Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
+        List<Map> list =  pdmBiPersoncorrdeviceService.queryAll(query);
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(result.getTotal());
+        return new ResponseEntity<>(build,HttpStatus.OK);
     }
 
     @PostMapping
     @Log("新增人员设备维护")
     @ApiOperation("新增人员设备维护")
     //@PreAuthorize("@el.check('personcorrdevice:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody PersoncorrdeviceDto dto){
-        personcorrdeviceService.create(dto);
+    public ResponseEntity<Object> create(@RequestBody JSONObject entity){
+        Assert.notNull(entity,"请求参数不能为空");
+        PdmBiPersoncorrdevice pdmBiPersoncorrdevice = entity.toJavaObject(PdmBiPersoncorrdevice.class);
+        pdmBiPersoncorrdevice.setId(IdUtil.getStringId());
+        pdmBiPersoncorrdeviceService.save(pdmBiPersoncorrdevice);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
-    @PutMapping
-    @Log("修改人员设备维护")
-    @ApiOperation("修改人员设备维护")
-    //@PreAuthorize("@el.check('personcorrdevice:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody PersoncorrdeviceDto dto){
-        personcorrdeviceService.update(dto);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
 
     @Log("删除人员设备维护")
     @ApiOperation("删除人员设备维护")
     //@PreAuthorize("@el.check('personcorrdevice:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        personcorrdeviceService.deleteAll(ids);
+        if (ids != null && ids.length>0){
+            pdmBiPersoncorrdeviceService.removeByIds(Arrays.asList(ids));
+        }
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    @PostMapping("/addPersons")
-    @Log("添加人员")
-    @ApiOperation("添加人员")
-    //@PreAuthorize("@el.check('teamcorrperson:list')")
-    public ResponseEntity<Object> addPersons(@RequestBody JSONObject param) {
-        personcorrdeviceService.addPersons(param);
-        return new ResponseEntity<>( HttpStatus.OK);
-    }
 
     @GetMapping("/getDeviceByPerson")
     @Log("查询设备")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java
index 559e3fd2..d4b836ce 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java
@@ -1,7 +1,15 @@
 package org.nl.wms.device_manage.service.userdevice;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.mps.service.dto.PersoncorrdeviceDto;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +21,63 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IPdmBiPersoncorrdeviceService extends IService<PdmBiPersoncorrdevice> {
 
+
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @return Map<String,Object>
+     */
+    List<Map> queryAll(Map whereJson);
+
+
+    /**
+     * 根据ID查询
+     * @param team_person_device_id ID
+     * @return Personcorrdevice
+     */
+    PersoncorrdeviceDto findById(Long team_person_device_id);
+
+    /**
+     * 根据编码查询
+     * @param code code
+     * @return Personcorrdevice
+     */
+    PersoncorrdeviceDto findByCode(String code);
+
+
+    /**
+     * 创建
+     * @param dto /
+     */
+    void create(PersoncorrdeviceDto dto);
+
+    /**
+     * 编辑
+     * @param dto /
+     */
+    void update(PersoncorrdeviceDto dto);
+
+    /**
+     * 多选删除
+     * @param ids /
+     */
+    void deleteAll(Long[] ids);
+
+    void addPersons(JSONObject param);
+
+    /**
+     * 设备
+     * @param whereJson 条件
+     * @param page 分页参数
+     * @return Map<String,Object>
+     */
+    Map<String,Object> getDeviceByPerson(Map whereJson, Pageable page);
+
+    Map<String, Object> getHeader(JSONObject param);
+
+    JSONArray getDeviceIdByUserId(JSONObject param);
+
+    void addDevices(JSONObject param);
+
+    void deleteRow(JSONObject param);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java
index 077276b5..ba887e34 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java
@@ -1,5 +1,6 @@
 package org.nl.wms.device_manage.service.userdevice.dao;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import lombok.Data;
@@ -20,6 +21,8 @@ public class PdmBiPersoncorrdevice implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id")
+    private String id;
     /**
      * 用户id
      */
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java
index ce8c5c96..09753fe3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java
@@ -3,6 +3,9 @@ package org.nl.wms.device_manage.service.userdevice.dao.mapper;
 import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 人员设备关系表 Mapper 接口
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PdmBiPersoncorrdeviceMapper extends BaseMapper<PdmBiPersoncorrdevice> {
 
+    List<Map> queryAll(Map query);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml
index f0e0fc83..48fe08c2 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdeviceMapper">
 
+    <select id="queryAll" resultType="java.util.Map">
+
+    </select>
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java
index bc9ebd44..0ed1305e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java
@@ -1,11 +1,19 @@
 package org.nl.wms.device_manage.service.userdevice.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
 import org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdeviceMapper;
 import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.mps.service.dto.PersoncorrdeviceDto;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 人员设备关系表 服务实现类
@@ -17,4 +25,64 @@ import org.springframework.stereotype.Service;
 @Service
 public class PdmBiPersoncorrdeviceServiceImpl extends ServiceImpl<PdmBiPersoncorrdeviceMapper, PdmBiPersoncorrdevice> implements IPdmBiPersoncorrdeviceService {
 
+    @Override
+    public List<Map> queryAll(Map query) {
+        this.baseMapper.queryAll(query);
+        return null;
+    }
+
+    @Override
+    public PersoncorrdeviceDto findById(Long team_person_device_id) {
+        return null;
+    }
+
+    @Override
+    public PersoncorrdeviceDto findByCode(String code) {
+        return null;
+    }
+
+    @Override
+    public void create(PersoncorrdeviceDto dto) {
+
+    }
+
+    @Override
+    public void update(PersoncorrdeviceDto dto) {
+
+    }
+
+    @Override
+    public void deleteAll(Long[] ids) {
+
+    }
+
+    @Override
+    public void addPersons(JSONObject param) {
+
+    }
+
+    @Override
+    public Map<String, Object> getDeviceByPerson(Map whereJson, Pageable page) {
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> getHeader(JSONObject param) {
+        return null;
+    }
+
+    @Override
+    public JSONArray getDeviceIdByUserId(JSONObject param) {
+        return null;
+    }
+
+    @Override
+    public void addDevices(JSONObject param) {
+
+    }
+
+    @Override
+    public void deleteRow(JSONObject param) {
+
+    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java
index 1e846f08..689cbad4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java
@@ -2,6 +2,7 @@
 package org.nl.wms.ext.sap.rest;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -30,6 +31,7 @@ import java.util.Map;
 @Api(tags = "wms发送sap")
 @RequestMapping("/api/sap/")
 @Slf4j
+@SaIgnore
 public class WmsToSapController {
     private final WmsToSapService wmsToSapService;
 
@@ -50,6 +52,7 @@ public class WmsToSapController {
     @PostMapping("/getDeliveryNote")
     @Log("获取物料基础信息")
     @ApiOperation("获取物料基础信息")
+    @SaIgnore
     public ResponseEntity<Object> getDeliveryNote(@RequestBody JSONObject form) {
         return new ResponseEntity<>(wmsToSapService.getDeliveryNote(form), HttpStatus.OK);
     }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
index b1169c90..a55be15b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
@@ -216,6 +216,10 @@ public class SpeFullTask extends AbstractAcsTask {
                     taskService.update(wrapper);
                     //outboxt箱子更新到任务表vechile_code2?
                     if (extParam.get("inbox") != null){
+                        List<SchCachelineVehilematerial> list = cacheLineVechileService.list(new QueryWrapper<SchCachelineVehilematerial>().eq("vehicle_code", extParam.get("inbox")));
+                        if (!CollectionUtils.isEmpty(list)){
+                            cacheLineVechileService.removeByIds(list.stream().map(SchCachelineVehilematerial::getVehmaterial_id).collect(Collectors.toList()));
+                        }
                         SchCachelineVehilematerial vehilematerial = new SchCachelineVehilematerial();
                         vehilematerial.setCreate_time(DateUtil.now());
                         vehilematerial.setVehmaterial_id(IdUtil.getStringId());
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
index d3f3f26d..0c76a243 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
@@ -11,6 +11,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
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 2c4cecd0..54f99e42 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
@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,8 +15,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.jsonwebtoken.lang.Assert;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.jetbrains.annotations.NotNull;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
@@ -30,6 +35,7 @@ import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstand
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
 import org.nl.wms.mps.service.WorkOrderImportEnum;
+import org.nl.wms.mps.service.dto.ProduceWorkorderDto;
 import org.nl.wms.mps.service.dto.ProduceshiftorderDto;
 import org.nl.wms.product_manage.ReportEnum;
 import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
@@ -42,6 +48,8 @@ import org.nl.wms.product_manage.service.workorder.dao.WorkorderRecord;
 import org.nl.wms.product_manage.service.workorder.dao.mapper.PdmProduceWorkorderMapper;
 import org.nl.wms.product_manage.service.workorder.dto.ReportQuery;
 import org.nl.wms.product_manage.service.workorder.dto.WorkorderQuery;
+import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService;
+import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure;
 import org.nl.wms.system_manage.service.user.ISysUserService;
 import org.nl.wms.system_manage.service.user.dao.SysUser;
 import org.redisson.misc.Hash;
@@ -55,9 +63,12 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -84,6 +95,8 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
     @Resource
     private PdmProduceWorkorderMapper pdmProduceWorkorderMapper;
     @Resource
+    private IPdmBiWorkprocedureService workprocedureService;
+    @Resource
     private IPdmProduceWorkorderrecordService reportRecordService;
 
     @Override
@@ -227,287 +240,130 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void excelImport(MultipartFile file, HttpServletRequest request) {
-        // todo: 根据需求修改
-        if (file.isEmpty()) {
-            throw new BadRequestException("文件为空,请添加数据后重新导入");
-        }
-        String currentUserId = SecurityUtils.getCurrentUserId();
-        String nickName = SecurityUtils.getCurrentNickName();
-        // 1.获取上传文件输入流
         InputStream inputStream = null;
         try {
             inputStream = file.getInputStream();
+            //A1_TW_+device_code  日期2023/5/30
+            //material_spec='24030921S'
+                ExcelReader excelReader = ExcelUtil.getReader(inputStream,"推弯计划表");
+                List<List<Object>> read = excelReader.read();
+                String produce_date = "";
+                // 循环获取的数据
+                List<PdmProduceWorkorder> data = new ArrayList<>();
+                row:
+                for (int i = 0; i < read.size(); i++) {
+                    List<Object> list = read.get(i);
+                    if (ObjectUtil.isEmpty(list)) {
+                        continue;
+                    }
+                    //获取每列
+                    JSONObject param = new JSONObject();
+                    //按照列获取
+                    param.put("workorder_id", IdUtil.getStringId());
+                    param.put("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER"));
+                    param.put("workorder_status", WorkerOrderEnum.CREATE.getCode());
+                    param.put("shift_type_scode", StatusEnum.DAYSHIFT.getCode()); // 默认白班
+                    String error_message = "";
+                    PdmProduceWorkorder workorder = new PdmProduceWorkorder();
+                    workorder.setWorkorder_id(IdUtil.getStringId());
+                    workorder.setWorkorder_code(CodeUtil.getNewCode("PDM_SHIFTORDER"));
+                    workorder.setWorkorder_status(WorkerOrderEnum.CREATE.getCode());
+                    workorder.setIs_needmove(true);
+                    workorder.setIs_canupdate_update(true);
+                    workorder.setCreate_time(DateUtil.now());
+                    workorder.setCreate_id(SecurityUtils.getCurrentUserId());
+                    workorder.setCreate_name("导入订单");
+                    workorder.setCreate_type(StatusEnum.EXCELINTO.getCode());
+
+                    Map<String,String> errorMap = new HashMap();
+                    for (int j = 0; j < list.size(); j++) {
+                        String col = String.valueOf(list.get(j));
+                        解析cell:{ //如果是第一行 为生产日期
+                            if (i == 0 && j == 0) {
+                                continue row;
+                            }
+                            //如果第一列包含规格二字 则为表头 结束内循环列
+                            if (j == 0 && col.contains("班次")) {
+                                continue row;
+                            }
+                            if (j == 0) {
+                                //物料
+                                workorder.setShift_type_scode(col.equals("夜班") ? "0" : "1");
+                            }
+                            if (j == 1) {
+                                //物料
+                                workorder.setPlanproduceend_date(col.substring(0,col.indexOf(" "))+" 18:30:00");
+                                workorder.setPlanproducestart_date(col.substring(0,col.indexOf(" "))+" 07:30:00");
+                            }
+                            if (j == 2) {
+                                //物料
+                                List<MdMeMaterialbase> material_specs = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().eq("material_spec", col));
+                                if (CollectionUtils.isEmpty(material_specs)) {
+                                    errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
+                                    error_message = error_message + col + "物料规格对应物料信息不存在，";
+                                } else {
+                                    Optional<MdMeMaterialbase> first = material_specs.stream().filter(new Predicate<MdMeMaterialbase>() {
+                                        @Override
+                                        public boolean test(MdMeMaterialbase mdMeMaterialbase) {
+                                            return mdMeMaterialbase.getMaterial_code().contains("S") && !mdMeMaterialbase.getMaterial_code().contains("TH");
+                                        }
+                                    }).findFirst();
+                                    if (!first.isPresent()) {
+                                        errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
+                                    }
+                                    workorder.setMaterial_id(first.get().getMaterial_id());
+                                }
+                            }
+                            if (j == 3) {
+                                PdmBiWorkprocedure workprocedure = workprocedureService.getOne(new QueryWrapper<PdmBiWorkprocedure>().eq("workprocedure_name", col));
+                                if (ObjectUtil.isEmpty(workprocedure)) {
+                                    errorMap.put("第" + i + "行" + col, "工序名称是否正确");
+                                } else {
+                                    workorder.setWorkprocedure_id(workprocedure.getWorkprocedure_id());
+                                }
+                            }
+                            if (j == 4) {
+                                //设备 A1_TW_
+                                workorder.setDevice_code("A1_TW_" + col);
+                            }
+                            if (j == 7) {
+                                //单重
+                                BigDecimal bigDecimal = BigDecimal.valueOf(Double.valueOf(col) * 1000);
+                                workorder.setMaterial_weight(bigDecimal.setScale(3, RoundingMode.HALF_UP));
+                            }
+                            if (j == 8) {
+                                //操作工
+                                SysUser user = userService.getOne(new QueryWrapper<SysUser>().eq("username", col));
+                                if (ObjectUtil.isEmpty(user)) {
+                                    errorMap.put("第" + i + "行" + col, " 操作工没有账号");
+                                } else {
+                                    workorder.setCurrent_produce_person_id(user.getUser_id());
+                                }
+                            }
+                            if (j == 9) {
+                                workorder.setPlan_qty(new BigDecimal(Long.valueOf(col)));
+                            }
+                        }
+                    }
+                    if (CollectionUtils.isEmpty(errorMap)){
+                        data.add(workorder);
+                    }else {
+                        throw new BadRequestException(JSON.toJSONString(errorMap));
+                    }
+                }
+            this.saveBatch(data);
+
         } catch (Exception e) {
             e.printStackTrace();
-        }
-        ExcelReader reader = ExcelUtil.getReader(inputStream);
-        // 调用用 hutool 方法读取数据 调用第一个sheet白班数据
-        ExcelReader excelReader = ExcelUtil.getReader(inputStream, 0);
-        // 从第1行开始获取数据   excelReader.read的结果是一个2纬的list，外层是行，内层是行对应的所有列
-        List<List<Object>> read = excelReader.read(0, excelReader.getRowCount());
-        String produce_date = "";
-        // 循环获取的数据
-        List<PdmProduceWorkorder> entitys = new ArrayList<>();
-        row:
-        for (int i = 0; i < read.size(); i++) {
-            List<Object> list = read.get(i);
-            if (ObjectUtil.isEmpty(list)) {
-                continue;
+            throw new BadRequestException(e.getMessage());
+        }finally {
+            if (inputStream !=null){
+                try {
+                    inputStream.close();
+                }catch (Exception ex){ }
             }
-            //获取每列
-            JSONObject param = new JSONObject();
-            //按照列获取
-            param.put("workorder_id", cn.hutool.core.util.IdUtil.getSnowflake(1, 1).nextId());
-            param.put("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER"));
-//            param.put("macoperate_id", IdUtil.getSnowflake(1, 1).nextId());
-            param.put("workorder_status", WorkerOrderEnum.CREATE.getCode());
-            param.put("shift_type_scode", StatusEnum.DAYSHIFT.getCode()); // 默认白班
-            String is_error = "0";
-            String error_message = "";
-            //循环每一行
-            col:
-            for (int j = 0; j < list.size(); j++) {
-
-                String col = String.valueOf(list.get(j));
-                //如果是第一行 为生产日期
-                if (i == 0 && j == 0) {
-                    produce_date = col.split("：")[col.split("：").length - 1];
-                    continue row;
-                }
-                //如果第一列包含规格二字 则为表头 结束内循环列
-                if (j == 0 && col.contains("规格名称")) {
-                    continue row;
-                }
-                if (j == 0) {
-                    //物料
-                    if (StrUtil.isEmpty(col)) {
-                        is_error = "1";
-                        error_message = error_message + "物料规格为空，";
-                    }
-                    MdMeMaterialbase material = materialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_spec", col));
-                    if (ObjectUtil.isEmpty(material)) {
-                        is_error = "1";
-                        error_message = error_message + "物料规格对应物料信息不存在，";
-                    } else {
-                        param.put("material_id", material.getMaterial_id());
-                    }
-                }
-                if (j == 2) {
-                    if (StrUtil.isEmpty(col)) {
-                        is_error = "1";
-                        error_message = error_message + "工序名称为空，";
-                    }
-                    WorkOrderImportEnum idByName = WorkOrderImportEnum.getIdByName(col);
-                    if (ObjectUtil.isEmpty(idByName)) {
-                        is_error = "1";
-                        error_message = error_message + "工序名称是否正确，";
-                    } else {
-                        param.put("workprocedure_id", idByName.getId());
-                    }
-                }
-                if (j == 4) {
-                    //单重
-                    param.put("material_weight", col);
-                }
-                if (j == 6) {
-                    if (StrUtil.isEmpty(col)) {
-                        is_error = "1";
-                        error_message = error_message + "工单计划数量为空，";
-                    } else {
-                        param.put("plan_qty", col);
-                    }
-                }
-                if (j == 10) {
-                    String workprocedure_id = param.getString("workprocedure_id");
-                    PdmBiDevice device = deviceService.getOne(new QueryWrapper<PdmBiDevice>().eq("device_code", col));
-                    if (ObjectUtil.isEmpty(device)) {
-                        is_error = "1";
-                        error_message = error_message + "设备编码不存在，";
-                    }
-                    if (!workprocedure_id.equals(device.getWorkprocedure_id())) {
-                        is_error = "1";
-                        error_message = error_message + "设备与所属工序不匹配，";
-                    } else {
-                        param.put("device_code", device.getDevice_code());
-                    }
-                }
-                if (j == 11) {
-                    SysUser jsonUser = userService.getOne(new QueryWrapper<SysUser>().eq("username", col));
-                    if (ObjectUtil.isEmpty(jsonUser)) {
-                        is_error = "1";
-                        error_message = error_message + "生产人员编码不存在！";
-                    } else {
-                        param.put("current_produce_person_id", jsonUser.getUser_id());
-                    }
-                }
-                if (j == 12) {
-                    //允许修改报工数量
-                    String is_canupdate = "0";
-                    if (col.equals("是")) {
-                        is_canupdate = "1";
-                    }
-                    param.put("is_canupdate_update", is_canupdate);
-                }
-                if (j == 13) {
-                    //是否agv搬运
-                    String needmoce = "0";
-                    if (col.equals("是")) {
-                        needmoce = "1";
-                    }
-                    param.put("is_needmove", needmoce);
-                }
-            }
-            param.put("is_error", is_error);
-            param.put("error_info", error_message);
-            param.put("create_type", StatusEnum.EXCELINTO.getCode());
-            param.put("planproducestart_date", produce_date + "07:30:00");
-            param.put("planproduceend_date", produce_date + "18:30:00");
-            param.put("create_id", currentUserId);
-            param.put("create_name", nickName);
-            param.put("create_time", DateUtil.now());
-            entitys.add(param.toJavaObject(PdmProduceWorkorder.class));
         }
 
-        // 1.获取上传文件输入流
-        inputStream = null;
-        try {
-            inputStream = file.getInputStream();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        //读取夜班工单数据
-        excelReader = ExcelUtil.getReader(inputStream, 1);
-        read = excelReader.read(0, excelReader.getRowCount());
-        String is_error = "0";
-        String error_message = "";
-        // 循环获取的数据
-        row:
-        for (int i = 0; i < read.size(); i++) {
-            List<Object> list = read.get(i);
-            //获取每列
-            JSONObject param = new JSONObject();
-            //按照列获取
-            param.put("workorder_id", cn.hutool.core.util.IdUtil.getSnowflake(1, 1).nextId());
-            param.put("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER"));
-//            param.put("producedeviceorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER"));
-            param.put("workorder_status", WorkerOrderEnum.CREATE.getCode());
-//            param.put("produce_date", produce_date);
-            param.put("shift_type_scode", StatusEnum.NIGHTSHIFT.getCode()); // 夜班
-            //循环每一行
-            col:
-            for (int j = 0; j < list.size(); j++) {
-
-                String col = String.valueOf(list.get(j));
-                //如果是第一行 为生产日期
-                if (i == 0 && j == 0) {
-                    produce_date = col.split("：")[col.split("：").length - 1];
-                    continue row;
-                }
-                //如果第一列包含规格二字 则为表头 结束内循环列
-                if (j == 0 && col.contains("规格名称")) {
-                    continue row;
-                }
-                if (j == 0) {
-                    //物料
-                    if (StrUtil.isEmpty(col)) {
-                        is_error = "1";
-                        error_message = error_message + "物料规格为空，";
-                    }
-                    MdMeMaterialbase material = materialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_spec", col));
-                    if (ObjectUtil.isEmpty(material)) {
-                        is_error = "1";
-                        error_message = error_message + "物料规格对应物料信息不存在，";
-                    } else {
-                        param.put("material_id", material.getMaterial_id());
-                    }
-                }
-                if (j == 2) {
-                    if (StrUtil.isEmpty(col)) {
-                        is_error = "1";
-                        error_message = error_message + "工序名称为空，";
-                    }
-                    WorkOrderImportEnum idByName = WorkOrderImportEnum.getIdByName(col);
-                    if (ObjectUtil.isEmpty(idByName)) {
-                        is_error = "1";
-                        error_message = error_message + "工序名称是否正确，";
-                    } else {
-                        param.put("workprocedure_id", idByName.getId());
-                    }
-                }
-                if (j == 4) {
-                    //单重
-                    param.put("material_weight", col);
-                }
-                if (j == 6) {
-                    if (StrUtil.isEmpty(col)) {
-                        is_error = "1";
-                        error_message = error_message + "工单计划数量为空，";
-                    } else {
-                        param.put("plan_qty", col);
-                    }
-                }
-//                if (j == 10) {
-//                    //物料
-//                    JSONObject json_material = wo_material.query("is_delete = '0' and material_code = '" + col + "'").uniqueResult(0);
-//                    if (ObjectUtil.isEmpty(json_material)) {
-//                        throw new BadRequestException("第'" + (i + 2) + "'行,物料编码不存在");
-//                    }
-//                    param.put("material_id", json_material.getString("material_id"));
-//                }
-                if (j == 10) {
-                    String workprocedure_id = param.getString("workprocedure_id");
-                    PdmBiDevice device = deviceService.getOne(new QueryWrapper<PdmBiDevice>().eq("device_code", col));
-                    if (ObjectUtil.isEmpty(device)) {
-                        is_error = "1";
-                        error_message = error_message + "设备编码不存在，";
-                    }
-                    if (!workprocedure_id.equals(device.getWorkprocedure_id())) {
-                        is_error = "1";
-                        error_message = error_message + "设备与所属工序不匹配，";
-                    } else {
-                        param.put("device_code", device.getDevice_code());
-                    }
-                }
-                if (j == 11) {
-                    SysUser jsonUser = userService.getOne(new QueryWrapper<SysUser>().eq("username", col));
-                    if (ObjectUtil.isEmpty(jsonUser)) {
-                        is_error = "1";
-                        error_message = error_message + "生产人员编码不存在！";
-                    } else {
-                        param.put("current_produce_person_id", jsonUser.getUser_id());
-                    }
-                }
-                if (j == 12) {
-                    //允许修改报工数量
-                    String is_canupdate = "0";
-                    if (col.equals("是")) {
-                        is_canupdate = "1";
-                    }
-                    param.put("is_canupdate_update", is_canupdate);
-                }
-                if (j == 13) {
-                    //是否agv搬运
-                    String needmoce = "0";
-                    if (col.equals("是")) {
-                        needmoce = "1";
-                    }
-                    param.put("is_needmove", needmoce);
-                }
-            }
-            param.put("is_error", is_error);
-            param.put("error_info", error_message);
-            param.put("create_type", StatusEnum.EXCELINTO.getCode());
-            param.put("planproducestart_date", produce_date + "18:30:00");
-            DateTime dateTime = DateUtil.offsetDay(DateUtil.parse(produce_date), 1);
-            param.put("planproduceend_date", DateUtil.format(dateTime, "yyyy-MM-dd") + " 07:30:00");
-            param.put("create_id", currentUserId);
-            param.put("create_name", nickName);
-            param.put("create_time", DateUtil.now());
-            entitys.add(param.toJavaObject(PdmProduceWorkorder.class));
-        }
-        if (!CollectionUtils.isEmpty(entitys)) {
-            this.saveBatch(entitys);
-        }
     }
 
 
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
index 934d0dbd..ca24e5fc 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
@@ -23,11 +23,11 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      #      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       #      password: ${DB_PWD:123456}
-      password: ${DB_PWD:123456}
+      password: ${DB_PWD:942464Yy}
 
       # 初始连接数
       initial-size: 5
diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/deviceMaterial.js b/mes/qd/src/views/wms/device_manage/deviceMaterial/deviceMaterial.js
new file mode 100644
index 00000000..18bf01ee
--- /dev/null
+++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/deviceMaterial.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+export function query(data) {
+  return request({
+    url: 'api/specialDevice/query',
+    method: 'post',
+    data
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/specialDevice/update',
+    method: 'post',
+    data
+  })
+}
+
+export default { query, edit }
diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
new file mode 100644
index 00000000..d07a1cc2
--- /dev/null
+++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="app-container">
+    <!--表单组件-->
+    <el-dialog
+      append-to-body
+      :close-on-click-modal="false"
+      :before-close="crud.cancelCU"
+      :visible="crud.status.cu > 0"
+      :title="crud.status.title"
+      width="500px"
+    >
+      <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-form-item label="物料系列" prop="code">
+          <el-input v-model="form.material_spec" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="工序调度编号">
+          <el-input v-model="form.process_id" style="width: 370px;" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+      </div>
+    </el-dialog>
+    <!-- 字典列表 -->
+    <el-card class="box-card">
+      <!--工具栏-->
+      <div class="head-container">
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-input
+            v-model="query.search"
+            clearable
+            size="mini"
+            placeholder="设备编号模糊查询"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+          <rrOperation :permission="permission" />
+        </div>
+        <crudOperation :permission="permission" />
+      </div>
+      <!--表格渲染-->
+
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+        @current-change="handleCurrentChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="product_area" label="生产车间" width="100px" show-overflow-tooltip />
+        <el-table-column prop="device_code" label="设备编码" width="100px" show-overflow-tooltip />
+        <el-table-column prop="material_id" label="物料id" width="200px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.material_id">
+              <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
+            </el-input>
+          </template>
+        </el-table-column>
+        <el-table-column prop="material_name" label="物料名称" width="200px" show-overflow-tooltip />
+        <el-table-column prop="material_spec" label="物料规格" width="200px" show-overflow-toolti />
+        <el-table-column prop="deviceinstor_qty" label="深坑物料数量" align="center" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.deviceinstor_qty/" /></template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
+        <el-table-column label="操作" width="150px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="updateSKMaterial(scope.row)">提交修改</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <MaterDtl
+        :dialog-show.sync="materialShow"
+        :is-single="true"
+        :mater-opt-code="materType"
+        @setMaterValue="setMaterValue"
+      />
+      <!--分页组件-->
+      <pagination />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import crudDevice from '@/views/wms/device_manage/deviceMaterial/deviceMaterial.js'
+import CRUD, { presenter, header, form } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import MaterDtl from '@/views/wms/pub/MaterDialog'
+
+const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240', device_code: null, material_id: null, material_name: null, material_spec: null, deviceinstor_qty: null, remark: null }
+
+export default {
+  name: 'SKdevice',
+  components: { crudOperation, pagination, rrOperation, MaterDtl },
+  cruds() {
+    return [
+      CRUD({ title: '深坑设备物料', url: 'api/specialDevice/query', query: { product_area: 'A1', workprocedure_id: '1535144552481034240' }, idField: 'device_code', crudMethod: { ...crudDevice }})
+    ]
+  },
+  mixins: [presenter(), header(), form(defaultForm)],
+  data() {
+    return {
+      materialShow: false,
+      queryTypeOptions: [
+        { key: 'name', display_name: '字典名称' },
+        { key: 'description', display_name: '描述' }
+      ],
+      rules: {
+        material_spec: [
+          { required: true, message: '请输入编码', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    queryMater(index, row) {
+      this.materialShow = true
+      this.nowindex = index
+      this.nowrow = row
+    },
+    setMaterValue(row) {
+      this.nowrow.material_id = row.material_id
+      this.nowrow.material_code = row.material_code
+      this.nowrow.material_name = row.material_name
+      this.nowrow.material_spec = row.material_spec
+      this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/mes/qd/src/views/wms/device_manage/userDeviceReplate/index.vue b/mes/qd/src/views/wms/device_manage/userDeviceReplate/index.vue
new file mode 100644
index 00000000..f31200cf
--- /dev/null
+++ b/mes/qd/src/views/wms/device_manage/userDeviceReplate/index.vue
@@ -0,0 +1,293 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input
+          v-model="query.blurry"
+          size="mini"
+          clearable
+          placeholder="输入用户名"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <rrOperation />
+      </div>
+      <crudOperation :permission="permission" />
+    </div>
+    <!-- 表单渲染 -->
+    <el-dialog
+      append-to-body
+      :close-on-click-modal="false"
+      :before-close="crud.cancelCU"
+      :visible.sync="crud.status.cu > 0"
+      :title="crud.status.title"
+      width="520px"
+    >
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-form-item label="角色名称" prop="name">
+          <el-input v-model="form.name" style="width: 380px;" />
+        </el-form-item>
+        <el-form-item label="备注" prop="description">
+          <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+      </div>
+    </el-dialog>
+    <el-row :gutter="15">
+      <!--角色管理-->
+      <el-col :span="12" style="margin-bottom: 10px">
+        <el-card class="box-card" shadow="never">
+          <div slot="header" class="clearfix">
+            <span class="role-span">用户列表</span>
+          </div>
+          <el-table
+            ref="table"
+            v-loading="crud.loading"
+            highlight-current-row
+            style="width: 100%;"
+            :data="crud.data"
+            @selection-change="crud.selectionChangeHandler"
+            @current-change="handleCurrentChange"
+          >
+            <el-table-column type="selection" width="55" />
+            <el-table-column prop="name" label="名称" min-width="100" show-overflow-tooltip />
+            <el-table-column show-overflow-tooltip prop="remark" label="描述" />
+            <el-table-column show-overflow-tooltip width="135px" prop="createTime" label="创建日期">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-permission="['admin','roles:edit','roles:del']"
+              label="操作"
+              width="130px"
+              align="center"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <udOperation
+                  :data="scope.row"
+                  :permission="permission"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页组件-->
+          <pagination />
+        </el-card>
+      </el-col>
+      <!-- 菜单授权 -->
+      <el-col :span="12">
+        <el-card class="box-card" shadow="never">
+          <div slot="header" class="clearfix">
+            <el-tooltip class="item" effect="dark" content="选择指定用户分配设备" placement="top">
+              <span class="role-span">设备分配</span>
+            </el-tooltip>
+            <el-button
+              v-permission="['admin','roles:edit']"
+              :disabled="!showButton"
+              :loading="menuLoading"
+              icon="el-icon-check"
+              size="mini"
+              style="float: right; padding: 6px 10px"
+              type="primary"
+              @click="saveMenu"
+            >保存
+            </el-button>
+          </div>
+
+          <el-tree
+            ref="menu"
+            lazy
+            :data="menus"
+            :default-checked-keys="menu_ids"
+            :load="getMenuDatas"
+            :props="defaultProps"
+            check-strictly
+            accordion
+            show-checkbox
+            node-key="menu_id"
+            @check="menuChange"
+          />
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import crudUsers from '@/views/system/user/user.js'
+import crudMenu from '@/views/system/menu/menu'
+import { getChild, getMenusTree } from '@/views/system/menu/menu'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+
+const defaultForm = { role_id: null, name: null, remark: null }
+export default {
+  name: 'Role',
+  components: { pagination, crudOperation, rrOperation, udOperation, crudMenu },
+  cruds() {
+    return CRUD({ idField: 'user_id', title: '用户', url: '/api/users', crudMethod: { ...crudUsers }})
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      defaultProps: { children: 'children', label: 'title', isLeaf: 'leaf' },
+      currentId: 0, menuLoading: false, showButton: false,
+      menus: [], menu_ids: [], // 多选时使用
+      permission: {
+        add: ['admin', 'roles:add'],
+        edit: ['admin', 'roles:edit'],
+        del: ['admin', 'roles:del']
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        permission: [
+          { required: true, message: '请输入权限', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    getMenuDatas(node, resolve) {
+      setTimeout(() => {
+        getMenusTree(node.data.menu_id ? node.data.menu_id : 0).then(res => {
+          resolve(res)
+        })
+      }, 100)
+    },
+    getMenusByRole(val) {
+      if (this.currentId && val[0] && val[1]) {
+        const param = {
+          role_id: this.currentId,
+          system_type: val[0],
+          category: val[1]
+        }
+
+        const _this = this
+        crudMenu.getMenusByRole(param).then(res => {
+          _this.menus = res
+
+          // 初始化默认选中的key
+          _this.menu_ids = []
+          _this.menus.forEach(function(data) {
+            _this.menu_ids.push(data)
+          })
+        })
+      }
+    },
+    [CRUD.HOOK.afterRefresh]() {
+      this.$refs.menu.setCheckedKeys([])
+    },
+    // 提交前做的操作
+    [CRUD.HOOK.afterValidateCU](crud) {
+      return true
+    },
+    // 触发单选
+    handleCurrentChange(val) {
+      if (val) {
+        const _this = this
+        // 清空菜单的选中
+        this.$refs.menu.setCheckedKeys([])
+        // 保存当前的角色id
+        this.currentId = val.role_id
+        // 初始化默认选中的key
+        this.menu_ids = []
+        val.menus.forEach(function(data) {
+          _this.menu_ids.push(data)
+        })
+        this.showButton = true
+      }
+    },
+    menuChange(menu) {
+      // 获取该节点的所有子节点，id 包含自身
+      getChild(menu.menu_id).then(childIds => {
+        // 判断是否在 menu_ids 中，如果存在则删除，否则添加
+        if (this.menu_ids.indexOf(menu.menu_id) !== -1) {
+          for (let i = 0; i < childIds.length; i++) {
+            const index = this.menu_ids.indexOf(childIds[i])
+            if (index !== -1) {
+              this.menu_ids.splice(index, 1)
+            }
+          }
+        } else {
+          for (let i = 0; i < childIds.length; i++) {
+            const index = this.menu_ids.indexOf(childIds[i])
+            if (index === -1) {
+              this.menu_ids.push(childIds[i])
+            }
+          }
+        }
+        this.$refs.menu.setCheckedKeys(this.menu_ids)
+      })
+    },
+    // 保存菜单
+    saveMenu() {
+      this.menuLoading = true
+      const role = { role_id: this.currentId, menus: [] }
+      // 得到已选中的 key 值
+      this.menu_ids.forEach(function(menu_id) {
+        const menu = { menu_id: menu_id }
+        role.menus.push(menu)
+      })
+      crudRoles.editMenu(role).then(() => {
+        this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.menuLoading = false
+        this.crud.toQuery()
+        // this.update()
+      }).catch(err => {
+        this.menuLoading = false
+        console.log(err.response.data.message)
+      })
+    },
+    // 改变数据
+    update() {
+      // 无刷新更新 表格数据
+      crudRoles.get(this.currentId).then(res => {
+        for (let i = 0; i < this.crud.data.length; i++) {
+          if (res.menu_id === this.crud.data[i].menu_id) {
+            this.crud.data[i] = res
+            break
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.role-span {
+  font-weight: bold;
+  color: #303133;
+  font-size: 15px;
+}
+</style>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+
+::v-deep .el-card__header {
+  padding: 5px 0 5px 10px;
+  background-color: #f8f8f9;
+}
+
+::v-deep .el-card__body {
+  padding: 10px 0 10px 0;
+}
+</style>
diff --git a/mes/qd/src/views/wms/device_manage/userDeviceReplate/role.js b/mes/qd/src/views/wms/device_manage/userDeviceReplate/role.js
new file mode 100644
index 00000000..6932c75d
--- /dev/null
+++ b/mes/qd/src/views/wms/device_manage/userDeviceReplate/role.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+// 获取所有的Role
+export function getAll() {
+  return request({
+    url: 'api/sysRole/all',
+    method: 'get'
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/sysRole',
+    method: 'post',
+    data
+  })
+}
+
+export function get(id) {
+  return request({
+    url: 'api/sysRole/' + id,
+    method: 'get'
+  })
+}
+
+export function getLevel() {
+  return request({
+    url: 'api/sysRole/level',
+    method: 'get'
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/sysRole',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/sysRole',
+    method: 'put',
+    data
+  })
+}
+
+export function editMenu(data) {
+  return request({
+    url: 'api/sysRole/menu',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, get, editMenu, getLevel }

From 4d446905daf83992c3199051f07ac16ecd42bfaf Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 7 Jun 2023 17:42:48 +0800
Subject: [PATCH 09/19] =?UTF-8?q?rev:=E6=B7=B1=E5=9D=91=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
index d07a1cc2..23a3782b 100644
--- a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
+++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
@@ -66,7 +66,7 @@
         <el-table-column prop="material_spec" label="物料规格" width="200px" show-overflow-toolti />
         <el-table-column prop="deviceinstor_qty" label="深坑物料数量" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.deviceinstor_qty/" /></template>
+            <el-input v-model="scope.row.deviceinstor_qty" /></template>
         </el-table-column>
         <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
         <el-table-column label="操作" width="150px" align="center" fixed="right">

From 105e5d52e9333ae61f572a21ba7c9b6dae97d83c Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 8 Jun 2023 09:56:15 +0800
Subject: [PATCH 10/19] =?UTF-8?q?rev=EF=BC=9A=E6=B7=B1=E5=9D=91=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=89=A9=E6=96=99=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
index d07a1cc2..f8eacf4d 100644
--- a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
+++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
@@ -66,7 +66,7 @@
         <el-table-column prop="material_spec" label="物料规格" width="200px" show-overflow-toolti />
         <el-table-column prop="deviceinstor_qty" label="深坑物料数量" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.deviceinstor_qty/" /></template>
+            <el-input v-model="scope.row.deviceinstor_qty" /></template>
         </el-table-column>
         <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
         <el-table-column label="操作" width="150px" align="center" fixed="right">
@@ -88,7 +88,7 @@
 </template>
 
 <script>
-import crudDevice from '@/views/wms/device_manage/deviceMaterial/deviceMaterial.js'
+import crudDevice from '@/views/wms/device_manage/deviceMaterial/deviceMaterial'
 import CRUD, { presenter, header, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'

From 22925124767d0ff544bc84bf5b7b1cb76f94c34f Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Thu, 8 Jun 2023 14:54:25 +0800
Subject: [PATCH 11/19] =?UTF-8?q?rev:=E5=B7=A5=E5=8D=95=E5=AF=BC=E5=85=A5/?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=BA=BF=E7=89=A9=E6=96=99=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/hd/nladmin-system/pom.xml                 |   2 +-
 .../acs/service/impl/AcsToWmsServiceImpl.java |  17 +-
 .../bigScreen/rest/BigScreenController.java   |   2 +
 .../rest/DeviceScreenController.java          |   2 +
 .../ext/bigScreen/rest/ProductController.java |   2 +
 .../ProduceshiftorderController.java          |   7 +-
 .../sch/tasks/SpeMachinery/SpeEmpTask.java    |   8 +
 .../dao/mapper/PdmProduceWorkorderMapper.xml  |   4 +
 .../impl/IPdmProduceWorkorderServiceImpl.java |  11 +-
 .../controller/menu/SysMenuController.java    |   1 +
 .../resources/config/application-prod.yml     |  85 +++---
 .../src/main/resources/logback-spring.xml     |   8 +-
 mes/qd/src/views/system/user/index.vue        |   2 +-
 .../views/wms/pcs/deliveryorder/Dialog.vue    |  93 ------
 .../src/views/wms/pcs/deliveryorder/index.vue | 283 ------------------
 15 files changed, 90 insertions(+), 437 deletions(-)
 delete mode 100644 mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue
 delete mode 100644 mes/qd/src/views/wms/pcs/deliveryorder/index.vue

diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml
index 6fa1e7f7..48c80fe6 100644
--- a/mes/hd/nladmin-system/pom.xml
+++ b/mes/hd/nladmin-system/pom.xml
@@ -30,8 +30,8 @@
 
     <dependencies>
         <dependency>
-            <artifactId>poi</artifactId>-->
             <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
             <version>4.0.0</version>
         </dependency>
         <dependency>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 16f93441..cf0e2142 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -5,6 +5,8 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.enums.AcsTaskEnum;
@@ -39,6 +41,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -131,6 +134,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
             String status = row.getString("status");
             // 任务处理类
             try {
+
+                AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
+                if (taskHandler!=null){
+                    taskHandler.updateTaskStatus(row,status);
+                }
                 //发布一个任务执行事件
                 TaskEvent event = TaskEvent.builder()
                         .task_id(task_id)
@@ -138,9 +146,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
                         .status(status)
                         .build();
                 BussEventMulticaster.Publish(event);
-
-                /*AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
-                taskHandler.updateTaskStatus(row,status);*/
             } catch (Exception e) {
                 log.error("任务状态更新失败:{}", e.getMessage());
                 JSONObject json = new JSONObject();
@@ -292,15 +297,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
     @Override
     @Async
     public void feedOrderRealQty(JSONObject param) {
-        WQLObject wo = WQLObject.getWQLObject("pdm_produce_workorder");
         if (CollectionUtils.isEmpty(param)){
             return;
         }
         Iterator<String> iterator = param.keySet().iterator();
         while (iterator.hasNext()){
             String workorderCode = iterator.next();
-            String real_qty = param.getString(workorderCode);
-            wo.update(MapOf.of("real_qty",real_qty),"workorder_code = '"+workorderCode+"'");
+            BigDecimal dq_real_qty = param.getBigDecimal(workorderCode);
+            workorderService.update(new UpdateWrapper<PdmProduceWorkorder>()
+                    .set("dq_real_qty",dq_real_qty).eq("workorder_code",workorderCode));
         }
     }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java
index bef7d3f9..8a0540ff 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.ext.bigScreen.rest;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,6 +24,7 @@ import java.util.Map;
 @Api(tags = "监控大屏")
 @RequestMapping("/api/bigScreenScreen")
 @Slf4j
+@SaIgnore
 @CrossOrigin
 public class BigScreenController {
    private final BigScreenService bigScreenService;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
index 7ec9ae86..dd3ea843 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.ext.bigScreen.rest;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequiredArgsConstructor
 @Api(tags = "设备监控大屏")
 @RequestMapping("/api/deviceScreen")
+@SaIgnore
 @Slf4j
 public class DeviceScreenController {
     private final DeviceScreenService deviceScreenService;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
index 4f5e8924..c30d21a1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
@@ -2,6 +2,7 @@
 package org.nl.wms.ext.bigScreen.rest;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
@@ -26,6 +27,7 @@ import java.util.Map;
 @RequiredArgsConstructor
 @Api(tags = "大屏生产监控中心")
 @RequestMapping("/api/bigscreen/product")
+@SaIgnore
 @Slf4j
 public class ProductController {
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
index 1be3d857..62a79b47 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
@@ -10,6 +10,7 @@ import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.enums.WorkerOrderEnum;
 import org.nl.common.utils.RedissonUtils;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.api.RestBusinessTemplate;
 import org.nl.common.utils.api.ResultCode;
 import org.nl.modules.common.exception.BizCoreException;
@@ -22,8 +23,11 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author qinx
@@ -86,7 +90,8 @@ public class ProduceshiftorderController{
                throw new BizCoreException(ResultCode.VALIDATE_FAILED);
           }
           /** @see org.nl.common.enums.WorkerOrderEnum */
-          param.put("workorder_status","'2','3','4','5'");
+          param.put("workorder_status","'2','3','4'");
+          param.put("optuser",SecurityUtils.getCurrentUserId());
           List<Map> list = iPdmProduceWorkorderService.getOrderList(param, page);
           return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
      }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
index 314a3062..fccbbd3a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
@@ -33,6 +33,8 @@ import org.nl.wms.scheduler_manage.service.scheduler.ISchProcessRouteService;
 import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl.FlowElement;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
+import org.nl.wms.system_manage.service.param.ISysParamService;
+import org.nl.wms.system_manage.service.param.dao.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -64,6 +66,8 @@ public class SpeEmpTask extends AbstractAcsTask {
     private ISchCachelineVehilematerialService vehilematerialService;
     @Autowired
     private ISchProcessRouteService schProcessRouteService;
+    @Autowired
+    private ISysParamService sysParamService;
 
     private final Map<String,SpeStatusHandler >  SpeHandles= new HashMap<>();
 
@@ -86,6 +90,10 @@ public class SpeEmpTask extends AbstractAcsTask {
     @Override
     @Transactional
     public String createTask(JSONObject param) {
+        Param speemp = sysParamService.getOne(new QueryWrapper<Param>().eq("code", "speemp"));
+        if (speemp !=null){
+            return "speemp";
+        }
         //{"workorder_code":230523019,"device_code":"A1_TW_15_6_D","type":"1"}
         String cahceLine = getRouteXmlFlowByWorkprodure(param);
         if (cahceLine == null) { return null; }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
index f02d2005..a3e23b72 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
@@ -103,6 +103,10 @@
         <if test="realproduceend_date != null and realproduceend_date != ''">
             and #{realproduceend_date} >= workorder.realproducestart_date
         </if>
+
+        <if test="optuser != null and optuser != ''">
+            and workorder.current_produce_person_id = #{optuser}
+        </if>
         order by workorder_code desc
     </select>
 
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 54f99e42..290d582a 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
@@ -288,7 +288,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                             }
                             if (j == 0) {
                                 //物料
-                                workorder.setShift_type_scode(col.equals("夜班") ? "0" : "1");
+                                workorder.setShift_type_scode(col.equals("晚上") ? "2" : "1");
                             }
                             if (j == 1) {
                                 //物料
@@ -302,12 +302,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                                     errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
                                     error_message = error_message + col + "物料规格对应物料信息不存在，";
                                 } else {
-                                    Optional<MdMeMaterialbase> first = material_specs.stream().filter(new Predicate<MdMeMaterialbase>() {
-                                        @Override
-                                        public boolean test(MdMeMaterialbase mdMeMaterialbase) {
-                                            return mdMeMaterialbase.getMaterial_code().contains("S") && !mdMeMaterialbase.getMaterial_code().contains("TH");
-                                        }
-                                    }).findFirst();
+                                    Optional<MdMeMaterialbase> first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S") && !mdMeMaterialbase.getMaterial_code().contains("TH")).findFirst();
                                     if (!first.isPresent()) {
                                         errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
                                     }
@@ -333,7 +328,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                             }
                             if (j == 8) {
                                 //操作工
-                                SysUser user = userService.getOne(new QueryWrapper<SysUser>().eq("username", col));
+                                SysUser user = userService.getOne(new QueryWrapper<SysUser>().eq("person_name", col));
                                 if (ObjectUtil.isEmpty(user)) {
                                     errorMap.put("第" + i + "行" + col, " 操作工没有账号");
                                 } else {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
index 507cde2d..c214dfd4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
@@ -43,6 +43,7 @@ public class SysMenuController {
 
     @GetMapping(value = "/build")
     @ApiOperation("根据用户获取菜单")
+    @Log("caidan")
     public ResponseEntity<Object> buildMenus(@Validated String systemType) {
         //校验系统表是否存在该系统类型
         return new ResponseEntity(iSysMenuService.buildMenus(systemType),HttpStatus.OK);
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
index 3889c63b..1d07470d 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8099
+  port: 8011
 #配置数据源
 spring:
   data:
@@ -8,30 +8,32 @@ spring:
         enabled: true
       client:
         reactive:
-          #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
-          #          endpoints: 192.168.46.2255:8200 #外网
-          endpoints: http://192.168.46.2255:9200 #外网
+          #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网
+          #          endpoints: 47.96.133.178:8200 #外网
+          endpoints: http://192.168.46.225:9200 #外网
   elasticsearch:
     rest:
-      #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
-      #      uris: 192.168.46.2255:8200 #外网
-      uris: http://192.168.46.2255:8200 #外网
-      username: elastic
-      password: 123456
+      #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网
+      #      uris: 47.96.133.178:8200 #外网
+      uris: http://192.168.46.225:9200 #外网
+  #      username: elastic
+  #      password: 123456
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      #      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
+      #      password: ${DB_PWD:123456}
       password: ${DB_PWD:123456}
-      #password: ${DB_PWD:Root.123456}
+
       # 初始连接数
-      initial-size: 15
+      initial-size: 5
       # 最小连接数
-      min-idle: 45
+      min-idle: 15
       # 最大连接数
-      max-active: 90
+      max-active: 30
       # 是否自动回收超时连接
       remove-abandoned: true
       # 超时时间(以秒数为单位)
@@ -61,11 +63,12 @@ spring:
         reset-enable: false
       filters:
         DruidFilter,stat
+
   redis:
     #数据库索引
-    database: ${REDIS_DB:6}
-    host: ${REDIS_HOST:127.0.0.1}
-    #host: ${REDIS_HOST:localhost}
+    database: ${REDIS_DB:1}
+    #host: ${REDIS_HOST:127.0.0.1}
+    host: ${REDIS_HOST:localhost}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
     #连接超时时间
@@ -169,29 +172,31 @@ sa-token:
   cookie:
     # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
     domain:
+  is-read-cookie: false
 
-jetcache:
-  defaultCacheType: LOCAL
-  statIntervalMinutes: 15
-  areaInCacheName: false
-  hiddenPackages: com.yb
-  local:
-    default:
-      type: caffeine
-      limit: 100
-      keyConvertor: fastjson
-      expireAfterWriteInMillis: 60000
-  remote:
-    default:
-      type: redis.lettuce
-      keyConvertor: fastjson
-      valueEncoder: kryo
-      valueDecoder: kryo
-      poolConfig:
-        minIdle: 5
-        maxIdle: 200
-        maxTotal: 1000
-      uri:
-        - redis://127.0.0.1:6379
+#jetcache:
+#  defaultCacheType: LOCAL
+#  statIntervalMinutes: 15
+#  areaInCacheName: false
+#  hiddenPackages: com.yb
+#  local:
+#    default:
+#      type: caffeine
+#      limit: 100
+#      keyConvertor: fastjson
+#      expireAfterWriteInMillis: 60000
+#  remote:
+#    default:
+#      type: redis.lettuce
+#      keyConvertor: fastjson
+#      valueEncoder: kryo
+#      valueDecoder: kryo
+#      poolConfig:
+#        minIdle: 5
+#        maxIdle: 200
+#        maxTotal: 1000
+#      uri:
+#        - redis://127.0.0.1:6379
 es:
   index: mes_log
+schedulerFile: C:\mes\scheduler.xml
diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
index 4be68a29..6dc32a33 100644
--- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -145,11 +145,11 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>
-    <springProfile name="dev3">
-        <root level="debug">
+    <springProfile name="prod">
+        <root level="info">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="esLogAppender"/>
         </root>
-
         <logger name="jdbc.audit" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
@@ -185,7 +185,7 @@ https://juejin.cn/post/6844903775631572999
 
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
-        <root level="warn">
+        <root level="info">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="asyncFileAppender"/>
         </root>
diff --git a/mes/qd/src/views/system/user/index.vue b/mes/qd/src/views/system/user/index.vue
index 87617126..b6b2094d 100644
--- a/mes/qd/src/views/system/user/index.vue
+++ b/mes/qd/src/views/system/user/index.vue
@@ -644,7 +644,7 @@ export default {
       // 默认选中
       const deptIds = []
       for (var index in row.depts) {
-        deptIds.push(row.depts[index].dept_ud)
+        deptIds.push(row.depts[index].dept_id)
       }
       this.$nextTick(() => {
         this.$refs.deptUser.setCheckedKeys(deptIds)
diff --git a/mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue b/mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue
deleted file mode 100644
index 04fa9dc0..00000000
--- a/mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-  <el-dialog
-    title="发货单导入"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    :show-close="true"
-    width="500px"
-    v-loading.fullscreen.lock="fullscreenLoading"
-    @close="close"
-  >
-    <div class="head-container">
-      <div>
-        <!-- 搜索 -->
-        <el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
-          <el-form-item label="日期区间：" prop="createTime">
-            <el-date-picker
-              v-model="form.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            />
-          </el-form-item>
-          <el-form-item label="发货单号:" prop="bill_code">
-            <el-input v-model="form.bill_code" style="width: 350px;"/>
-          </el-form-item>
-        </el-form>
-        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
-        </el-button>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-
-import CRUD, {header, presenter} from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker/index'
-import crudSap from '@/api/wms/ext/sap'
-
-export default {
-  name: 'importOrder',
-  components: {rrOperation, pagination, DateRangePicker},
-  cruds() {
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      fullscreenLoading: false,
-      dialogVisible: false,
-      form: {}
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    close() {
-      this.form = {}
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged', this.rows)
-    },
-    queryStruct() {
-
-      this.fullscreenLoading = true
-      if (this.form.createTime) {
-        this.form.date_begin = this.form.createTime[0]
-        this.form.date_end = this.form.createTime[1]
-      }
-      crudSap.getDeliveryNote(this.form).then(res => {
-        this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.fullscreenLoading = false
-      }).catch(() => {
-        this.fullscreenLoading = false
-      })
-    }
-  }
-}
-</script>
-
diff --git a/mes/qd/src/views/wms/pcs/deliveryorder/index.vue b/mes/qd/src/views/wms/pcs/deliveryorder/index.vue
deleted file mode 100644
index 8a254dae..00000000
--- a/mes/qd/src/views/wms/pcs/deliveryorder/index.vue
+++ /dev/null
@@ -1,283 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="80px"
-          label-suffix=":"
-        >
-          <el-form-item label="发货单号">
-            <el-input v-model="query.deliver_code" clearable placeholder="发货单号" style="width: 200px;"
-                      class="filter-item"/>
-          </el-form-item>
-          <el-form-item label="物料搜索">
-            <el-input
-              v-model="query.material"
-              clearable
-              size="small"
-              placeholder="物料编码、名称或规格"
-              style="width: 200px;"
-              class="filter-item"
-            />
-          </el-form-item>
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00','23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-select
-              v-model="query.status"
-              style="width: 200px"
-              clearable
-              filterable
-              placeholder="请选择"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.PCS_DELI_STATUS"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="产品系列">
-            <treeselect
-              v-model="query.product_series"
-              :options="classes3"
-              :auto-load-root-options="false"
-              :load-options="loadChildNodes"
-              style="width: 200px;"
-              placeholder="请选择"
-            />
-          </el-form-item>
-          <el-form-item label="是否正常">
-            <el-select
-              v-model="query.is_success"
-              style="width: 200px"
-              clearable
-              filterable
-              placeholder="请选择"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.IS_OR_NOT"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <rrOperation :crud="crud"/>
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          @click="importin"
-        >
-          同步
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
-                 :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
-                @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55"/>
-        <el-table-column prop="deliver_code" label="发货单号"/>
-        <el-table-column prop="seq_no" label="明细序号"/>
-        <el-table-column prop="deliver_type" label="发货单类型" width="120">
-          <template slot-scope="scope">
-            {{ dict.label.PCS_DELIVER_TYPE[scope.row.deliver_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="material_code" label="物料编码"/>
-        <el-table-column prop="material_name" label="物料名称"/>
-        <el-table-column prop="status" label="状态">
-          <template slot-scope="scope">
-            {{ dict.label.PCS_DELI_STATUS[scope.row.status] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="delivery_qty" label="发货数量"/>
-        <el-table-column prop="cust_code" label="客户编码"/>
-        <el-table-column prop="cust_coname" label="客户名称"/>
-        <el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150"/>
-        <el-table-column prop="sale_code" label="销售单号"/>
-        <el-table-column prop="sale_seq_no" label="销售明细序号" show-overflow-tooltip min-width="150"/>
-        <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200"/>
-        <el-table-column prop="create_name" label="创建人"/>
-        <el-table-column prop="create_time" label="创建时间"/>
-        <el-table-column prop="update_optname" label="修改人"/>
-        <el-table-column prop="update_time" label="修改时间"/>
-        <!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-                  <template slot-scope="scope">
-                    <udOperation
-                      :data="scope.row"
-                      :permission="permission"
-                    />
-                  </template>
-                </el-table-column>-->
-      </el-table>
-      <!--分页组件-->
-      <pagination/>
-    </div>
-    <Dialog :dialog-show.sync="dialogShow"/>
-  </div>
-</template>
-
-<script>
-import crudDeliveryOrder from '@/api/wms/pcs/deliveryOrder'
-import CRUD, {presenter, header, form, crud} from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import Dialog from '@/views/wms/pcs/deliveryorder/Dialog'
-import pagination from '@crud/Pagination'
-import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudClassstandard from '@/api/wms/basedata/master/classstandard'
-
-const defaultForm = {
-  deliver_id: null,
-  deliver_code: null,
-  seq_no: null,
-  deliver_type: null,
-  material_id: null,
-  status: null,
-  delivery_qty: null,
-  cust_id: null,
-  qty_unit_id: null,
-  sale_id: null,
-  sale_code: null,
-  sale_seq_no: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
-  cust_code: null,
-  cust_name: null
-}
-export default {
-  name: 'DeliveryOrder',
-  dicts: ['PCS_DELIVER_TYPE', 'PCS_DELI_STATUS'],
-  components: {pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog},
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '发货单', url: 'api/deliveryOrder', idField: 'deliver_id', sort: 'deliver_id,desc',
-      optShow: {
-        add: false,
-        edit: false,
-        del: false,
-        reset: true,
-        download: false
-      },
-      crudMethod: {...crudDeliveryOrder}
-    })
-  },
-  data() {
-    return {
-      classes3: [],
-      dialogShow: false,
-      permission: {},
-      rules: {},
-      queryTypeOptions: [
-        {key: 'deliver_code', display_name: '发货单号'}
-      ]
-    }
-  },
-  created() {
-    this.initClass3()
-  },
-  methods: {
-    queryClassId() {
-      const param = {
-        'class_idStr': this.class_idStr
-      }
-      crudClassstandard.queryClassById(param).then(res => {
-        this.classes = res.content.map(obj => {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    importin() {
-      this.dialogShow = true
-    },
-    buildTree(classes) {
-      classes.forEach(data => {
-        if (data.children) {
-          this.buildTree(data.children)
-        }
-        if (data.hasChildren && !data.children) {
-          data.children = null // 重点代码
-        }
-      })
-    },
-    // 获取子节点数据
-    loadChildNodes({action, parentNode, callback}) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({pid: parentNode.id}).then(res => {
-          parentNode.children = res.content.map(function (obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    },
-    initClass3() {
-      const param = {
-        parent_class_code: '07'
-      }
-      crudClassstandard.getClassType(param).then(res => {
-        const data = res.content
-        this.buildTree(data)
-        this.classes3 = data
-      })
-    },
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

From b237b67f6b2db819541eadce9a4a84da6e7ff8d1 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Thu, 8 Jun 2023 16:44:43 +0800
Subject: [PATCH 12/19] =?UTF-8?q?rev:=E6=B7=B1=E5=9D=91=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acs/service/impl/AcsToWmsServiceImpl.java |  18 +-
 .../ext/acs/service/impl/AgvInstService.java  |  12 +-
 .../device/SpecialDeviceController.java       |   1 +
 .../sch/tasks/SpeMachinery/SpeEmpTask.java    |   1 -
 .../sch/tasks/SpeMachinery/SpeFullTask.java   |   1 -
 .../service/device/IPdmBiDeviceService.java   |   3 +-
 .../service/device/dao/PdmBiDevice.java       |   1 +
 .../device/dao/mapper/PdmBiDeviceMapper.java  |   4 +-
 .../device/dao/mapper/PdmBiDeviceMapper.xml   |  26 +-
 .../device/impl/PdmBiDeviceServiceImpl.java   |  22 +-
 .../device_manage/deviceMaterial/index.vue    |  12 +-
 .../views/wms/pcs/deliveryorder/Dialog.vue    |  93 ++++++
 .../src/views/wms/pcs/deliveryorder/index.vue | 283 ++++++++++++++++++
 13 files changed, 462 insertions(+), 15 deletions(-)
 create mode 100644 mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue
 create mode 100644 mes/qd/src/views/wms/pcs/deliveryorder/index.vue

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index cf0e2142..7055b90f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -28,6 +28,8 @@ import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
 import org.nl.wms.product_manage.sch.service.TaskService;
 import org.nl.wms.product_manage.sch.service.dto.TaskDto;
 import org.nl.wms.product_manage.sch.tasks.WashMachineryTask;
+import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
+import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
 import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
@@ -60,6 +62,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
     private  CacheLineHandService cacheLineHandService;
     @Autowired
     private IPdmProduceWorkorderService workorderService;
+    @Autowired
+    private IPdmBiDeviceService deviceService;
 
 
 
@@ -139,7 +143,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
                 if (taskHandler!=null){
                     taskHandler.updateTaskStatus(row,status);
                 }
-                //发布一个任务执行事件
+                //发布一个任务执行事件:服务跟任务不一样，可以同事存在
                 TaskEvent event = TaskEvent.builder()
                         .task_id(task_id)
                         .task_type(taskDto.getTask_type())
@@ -261,8 +265,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
         while (iterator.hasNext()){
             String deviceCode = (String)iterator.next();
             if (!StringUtils.isEmpty(deviceCode)){
-                String qty = String.valueOf(param.get(deviceCode));
-                deviceTab.update(MapOf.of("deviceinstor_qty",qty),"device_code = '"+deviceCode+"'");
+                Map item = (Map)param.get(deviceCode);
+                Object qty = item.get("qty");
+                Object weight = item.get("weight");
+                UpdateWrapper<PdmBiDevice> wrapper = new UpdateWrapper<>();
+                wrapper.set("deviceinstor_qty",qty);
+                if (weight!=null){
+                    wrapper.set("deviceinstor_weight",weight);
+                }
+                wrapper.eq("device_code",deviceCode);
+                deviceService.update(wrapper);
             }
         }
     }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java
index 50b5c3cd..d67e8937 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -78,14 +79,17 @@ public class AgvInstService {
         Map query = MapOf.of("workprocedure_id", basePointService.getWorkprodureByCode(next.getId()).get("workprocedure_id")
                 , "qty", quantity,"spec",workprodure.get("spec"));
         //判断缓存线是不是去深坑清洗：深坑区域15个点：判断空的物料坑位：
+        List<Map<String,String>> collect = new ArrayList<>();
         if (next.getName().equals("深坑清洗")){
-            query.put("material_id",task.getString("material_id"));
-//            query.put("qty",quantity) 深坑物料需要转重量
             task.put("task_type",AcsTaskEnum.TASK_PRODUCT_WASH.getCode());
             task.put("task_name",AcsTaskEnum.TASK_PRODUCT_WASH.getDesc());
-
+            query.put("material_id",task.getString("material_id"));
+//            query.put("qty",quantity) 深坑物料需要转重量
+            collect = deviceService.workproceduceDevicesWeight(query);
+        }else {
+            collect = deviceService.workproceduceDevicesQty(query);
         }
-        List<Map<String,String>> collect = deviceService.workproceduceDevices(query);
+
         log.info("调度任务分配点位信息：", JSON.toJSONString(collect));
         List<Map<String, String>> list = collect.stream().filter(stringStringMap -> stringStringMap.get("tasks") == null || stringStringMap.get("materials").contains(task.getString("material_id"))).collect(Collectors.toList());
         task.put("acs_task_type",AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode());
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
index 18519171..159e64c8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
@@ -46,6 +46,7 @@ public class SpecialDeviceController {
 
     @GetMapping("/query")
     @ApiOperation("查询生产设备")
+    @Log("深坑物料")
     @SaIgnore
     public ResponseEntity<Object> query(DeviceQuery query,PageQuery page) {
         Page<Map<String, Object>> list = iDeviceService.pageMaps(page.build(PdmBiDevice.class), query.build());
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
index fccbbd3a..a429274c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
@@ -202,7 +202,6 @@ public class SpeEmpTask extends AbstractAcsTask {
                         if (!("fall_finish"+task.getTask_id()).equals(device.getRemark())){
                             iDeviceService.update(new UpdateWrapper<PdmBiDevice>()
                                     .set("material_id", task.getMaterial_id())
-                                    .set("deviceinstor_qty",device.getDeviceinstor_qty().add(task.getMaterial_qty()))
                                     .set("remark","fall_finish"+task.getTask_id())
                                     .eq("device_code", task.getPoint_code2()));
                         }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
index a55be15b..4d1925b6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
@@ -265,7 +265,6 @@ public class SpeFullTask extends AbstractAcsTask {
                         if (!("fall_finish"+task.getTask_id()).equals(one.getRemark())){
                             deviceService.update(new UpdateWrapper<PdmBiDevice>()
                                     .set("material_id", task.getMaterial_id())
-                                    .set("deviceinstor_qty",one.getDeviceinstor_qty().add(task.getMaterial_qty()))
                                     .set("remark","fall_finish"+task.getTask_id())
                                     .eq("device_code", task.getPoint_code2()));
                         }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/IPdmBiDeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/IPdmBiDeviceService.java
index 9428e420..28a021ee 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/IPdmBiDeviceService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/IPdmBiDeviceService.java
@@ -25,7 +25,8 @@ public interface IPdmBiDeviceService extends IService<PdmBiDevice> {
      * @param param
      * @return
      */
-    List<Map> workproceduceDevices(Map<String,Object> param);
+    List<Map> workproceduceDevicesQty(Map<String,Object> param);
+    List<Map> workproceduceDevicesWeight(Map<String,Object> param);
 
     /**
      * 根据点位查询对应设备
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java
index 9e3e4f69..4744105d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java
@@ -98,6 +98,7 @@ public class PdmBiDevice implements Serializable {
      * 设备实时来料仓数:用于数量校验
      */
     private BigDecimal deviceinstor_qty;
+    private BigDecimal deviceinstor_weight;
 
     /**
      * 设备实时产品仓数
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.java
index 115bc281..d860d200 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.java
@@ -19,7 +19,9 @@ public interface PdmBiDeviceMapper extends BaseMapper<PdmBiDevice> {
 
     List<Map> getNotWorkDevice(Map<String,Object> query);
 
-    List<Map> workproceduceDevices(Map<String,Object> query);
+    List<Map> workproceduceDevicesQty(Map<String,Object> query);
+
+    List<Map> workproceduceDevicesWeight(Map<String,Object> query);
 
     PdmBiDevice getDeviceByPoint(String pointCode);
 }
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 dda8af9f..72d62b99 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
@@ -18,7 +18,7 @@
         from PDM_produce_workOrder o
         where '5' > o.workorder_status and o.is_delete = '0' )
     </select>
-    <select id="workproceduceDevices" resultType="java.util.Map">
+    <select id="workproceduceDevicesQty" resultType="java.util.Map">
         select
         GROUP_CONCAT(sch_base_task.task_id) as tasks,GROUP_CONCAT(sch_base_task.material_id) as materials,
         pdm_bi_device.inupperlimit_qty - ifnull( sum( sch_base_task.material_qty ), 0 ) - pdm_bi_device.deviceinstor_qty AS currentQty,
@@ -39,6 +39,30 @@
         GROUP BY pdm_bi_device.device_code
         HAVING currentQty > #{qty}
     </select>
+
+    <select id="workproceduceDevicesWeight" resultType="java.util.Map">
+        select
+        GROUP_CONCAT(sch_base_task.task_id) as tasks,GROUP_CONCAT(sch_base_task.material_id) as materials,pdm_bi_device.inupperlimit_qty,pdm_bi_device.deviceinstor_weight,
+        pdm_bi_device.inupperlimit_qty - ifnull( sum( sch_base_task.material_qty*md_me_materialbase.net_weight), 0 ) - pdm_bi_device.deviceinstor_weight AS currentQty,
+        pdm_bi_device.device_code,
+        sch_base_point.point_code
+        from sch_base_point
+        left join pdm_bi_device on pdm_bi_device.device_code = sch_base_point.device_code
+        left JOIN sch_base_task ON sch_base_point.point_code = point_code2 and '7' > task_status
+        left join md_me_materialbase on sch_base_task.material_id = md_me_materialbase.material_id
+        where
+        sch_base_point.point_type = '4' and pdm_bi_device.is_used = true
+        and workprocedure_id = #{workprocedure_id}
+        <if test="material_id != null and material_id != ''">
+            and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '')
+        </if>
+        <if test="spec != null and spec != ''">
+            and (pdm_bi_device.spec = #{spec} or pdm_bi_device.spec is null)
+        </if>
+        GROUP BY pdm_bi_device.device_code
+        HAVING currentQty > #{qty}
+    </select>
+
     <select id="getDeviceByPoint" resultType="org.nl.wms.product_manage.service.device.dao.PdmBiDevice">
         select pdm_bi_device.* from pdm_bi_device
         left join sch_base_point on sch_base_point.device_code = pdm_bi_device.device_code
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/impl/PdmBiDeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/impl/PdmBiDeviceServiceImpl.java
index d24bc0a2..9769f47d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/impl/PdmBiDeviceServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/impl/PdmBiDeviceServiceImpl.java
@@ -1,10 +1,15 @@
 package org.nl.wms.product_manage.service.device.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
+import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
 import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
 import org.nl.wms.product_manage.service.device.dao.mapper.PdmBiDeviceMapper;
 import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -21,14 +26,27 @@ import java.util.Map;
 @Service
 public class PdmBiDeviceServiceImpl extends ServiceImpl<PdmBiDeviceMapper, PdmBiDevice> implements IPdmBiDeviceService {
 
+    @Autowired
+    private ISchBaseTaskService taskService;
+
+    @Autowired
+    protected IMdMeMaterialbaseService iMdMeMaterialbaseService; // 物料服务
+
     @Override
     public List<Map> getNotWorkDeviceByWorkproceduceId(JSONObject param) {
         return this.baseMapper.getNotWorkDevice(param);
     }
 
     @Override
-    public List<Map> workproceduceDevices(Map<String, Object> param) {
-        return this.baseMapper.workproceduceDevices(param);
+    public List<Map> workproceduceDevicesQty(Map<String, Object> param) {
+        return this.baseMapper.workproceduceDevicesQty(param);
+    }
+    @Override
+    public List<Map> workproceduceDevicesWeight(Map<String, Object> param) {
+        //#{workprocedure_id} //material_id //#{qty}
+        MdMeMaterialbase one = iMdMeMaterialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_id", param.get("material_id")));
+        param.put("qty",one.getNet_weight().doubleValue()*(int)param.get("qty"));
+        return this.baseMapper.workproceduceDevicesWeight(param);
     }
 
     @Override
diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
index 23a3782b..6605f899 100644
--- a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
+++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
@@ -68,6 +68,10 @@
           <template slot-scope="scope">
             <el-input v-model="scope.row.deviceinstor_qty" /></template>
         </el-table-column>
+        <el-table-column prop="deviceinstor_weight" label="深坑物料数量" align="center" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.deviceinstor_weight" /></template>
+        </el-table-column>
         <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
         <el-table-column label="操作" width="150px" align="center" fixed="right">
           <template slot-scope="scope">
@@ -95,7 +99,7 @@ import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 
-const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240', device_code: null, material_id: null, material_name: null, material_spec: null, deviceinstor_qty: null, remark: null }
+const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240', device_code: null, material_id: null, material_name: null, material_spec: null, deviceinstor_qty: null, deviceinstor_weight: null, remark: null }
 
 export default {
   name: 'SKdevice',
@@ -131,6 +135,12 @@ export default {
       this.nowindex = index
       this.nowrow = row
     },
+    updateSKMaterial(row) {
+      crudDevice.edit(row).then(() => {
+        this.notify('保存成功', 'success')
+      }).catch(() => {
+      })
+    },
     setMaterValue(row) {
       this.nowrow.material_id = row.material_id
       this.nowrow.material_code = row.material_code
diff --git a/mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue b/mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue
new file mode 100644
index 00000000..04fa9dc0
--- /dev/null
+++ b/mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue
@@ -0,0 +1,93 @@
+<template>
+  <el-dialog
+    title="发货单导入"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="true"
+    width="500px"
+    v-loading.fullscreen.lock="fullscreenLoading"
+    @close="close"
+  >
+    <div class="head-container">
+      <div>
+        <!-- 搜索 -->
+        <el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
+          <el-form-item label="日期区间：" prop="createTime">
+            <el-date-picker
+              v-model="form.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            />
+          </el-form-item>
+          <el-form-item label="发货单号:" prop="bill_code">
+            <el-input v-model="form.bill_code" style="width: 350px;"/>
+          </el-form-item>
+        </el-form>
+        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
+        </el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, {header, presenter} from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudSap from '@/api/wms/ext/sap'
+
+export default {
+  name: 'importOrder',
+  components: {rrOperation, pagination, DateRangePicker},
+  cruds() {
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      fullscreenLoading: false,
+      dialogVisible: false,
+      form: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    close() {
+      this.form = {}
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    },
+    queryStruct() {
+
+      this.fullscreenLoading = true
+      if (this.form.createTime) {
+        this.form.date_begin = this.form.createTime[0]
+        this.form.date_end = this.form.createTime[1]
+      }
+      crudSap.getDeliveryNote(this.form).then(res => {
+        this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.fullscreenLoading = false
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
+    }
+  }
+}
+</script>
+
diff --git a/mes/qd/src/views/wms/pcs/deliveryorder/index.vue b/mes/qd/src/views/wms/pcs/deliveryorder/index.vue
new file mode 100644
index 00000000..8a254dae
--- /dev/null
+++ b/mes/qd/src/views/wms/pcs/deliveryorder/index.vue
@@ -0,0 +1,283 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="发货单号">
+            <el-input v-model="query.deliver_code" clearable placeholder="发货单号" style="width: 200px;"
+                      class="filter-item"/>
+          </el-form-item>
+          <el-form-item label="物料搜索">
+            <el-input
+              v-model="query.material"
+              clearable
+              size="small"
+              placeholder="物料编码、名称或规格"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00','23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-select
+              v-model="query.status"
+              style="width: 200px"
+              clearable
+              filterable
+              placeholder="请选择"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.PCS_DELI_STATUS"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="产品系列">
+            <treeselect
+              v-model="query.product_series"
+              :options="classes3"
+              :auto-load-root-options="false"
+              :load-options="loadChildNodes"
+              style="width: 200px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
+          <el-form-item label="是否正常">
+            <el-select
+              v-model="query.is_success"
+              style="width: 200px"
+              clearable
+              filterable
+              placeholder="请选择"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation :crud="crud"/>
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          @click="importin"
+        >
+          同步
+        </el-button>
+      </crudOperation>
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
+                 :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="deliver_code" label="发货单号"/>
+        <el-table-column prop="seq_no" label="明细序号"/>
+        <el-table-column prop="deliver_type" label="发货单类型" width="120">
+          <template slot-scope="scope">
+            {{ dict.label.PCS_DELIVER_TYPE[scope.row.deliver_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="material_code" label="物料编码"/>
+        <el-table-column prop="material_name" label="物料名称"/>
+        <el-table-column prop="status" label="状态">
+          <template slot-scope="scope">
+            {{ dict.label.PCS_DELI_STATUS[scope.row.status] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="delivery_qty" label="发货数量"/>
+        <el-table-column prop="cust_code" label="客户编码"/>
+        <el-table-column prop="cust_coname" label="客户名称"/>
+        <el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150"/>
+        <el-table-column prop="sale_code" label="销售单号"/>
+        <el-table-column prop="sale_seq_no" label="销售明细序号" show-overflow-tooltip min-width="150"/>
+        <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200"/>
+        <el-table-column prop="create_name" label="创建人"/>
+        <el-table-column prop="create_time" label="创建时间"/>
+        <el-table-column prop="update_optname" label="修改人"/>
+        <el-table-column prop="update_time" label="修改时间"/>
+        <!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+                  <template slot-scope="scope">
+                    <udOperation
+                      :data="scope.row"
+                      :permission="permission"
+                    />
+                  </template>
+                </el-table-column>-->
+      </el-table>
+      <!--分页组件-->
+      <pagination/>
+    </div>
+    <Dialog :dialog-show.sync="dialogShow"/>
+  </div>
+</template>
+
+<script>
+import crudDeliveryOrder from '@/api/wms/pcs/deliveryOrder'
+import CRUD, {presenter, header, form, crud} from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import Dialog from '@/views/wms/pcs/deliveryorder/Dialog'
+import pagination from '@crud/Pagination'
+import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+
+const defaultForm = {
+  deliver_id: null,
+  deliver_code: null,
+  seq_no: null,
+  deliver_type: null,
+  material_id: null,
+  status: null,
+  delivery_qty: null,
+  cust_id: null,
+  qty_unit_id: null,
+  sale_id: null,
+  sale_code: null,
+  sale_seq_no: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  cust_code: null,
+  cust_name: null
+}
+export default {
+  name: 'DeliveryOrder',
+  dicts: ['PCS_DELIVER_TYPE', 'PCS_DELI_STATUS'],
+  components: {pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog},
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '发货单', url: 'api/deliveryOrder', idField: 'deliver_id', sort: 'deliver_id,desc',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      },
+      crudMethod: {...crudDeliveryOrder}
+    })
+  },
+  data() {
+    return {
+      classes3: [],
+      dialogShow: false,
+      permission: {},
+      rules: {},
+      queryTypeOptions: [
+        {key: 'deliver_code', display_name: '发货单号'}
+      ]
+    }
+  },
+  created() {
+    this.initClass3()
+  },
+  methods: {
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    importin() {
+      this.dialogShow = true
+    },
+    buildTree(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildTree(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null // 重点代码
+        }
+      })
+    },
+    // 获取子节点数据
+    loadChildNodes({action, parentNode, callback}) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({pid: parentNode.id}).then(res => {
+          parentNode.children = res.content.map(function (obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    initClass3() {
+      const param = {
+        parent_class_code: '07'
+      }
+      crudClassstandard.getClassType(param).then(res => {
+        const data = res.content
+        this.buildTree(data)
+        this.classes3 = data
+      })
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

From 756a2daf34a92f2b51e4939358d0e8e5fc542597 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Thu, 8 Jun 2023 18:32:55 +0800
Subject: [PATCH 13/19] =?UTF-8?q?REV=20=E4=B8=93=E6=9C=BA=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E3=80=81=E7=BC=93=E5=AD=98=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HailiangAutoCacheLineDeviceDriver.java    | 21 ++++++++++++++-----
 .../HailiangOldSpecialDeviceDriver.java       |  2 +-
 ...iangOldSpecialFullStationDeviceDriver.java |  3 +++
 .../HailiangSpecialDeviceDriver.java          |  2 +-
 ...ailiangSpecialFullStationDeviceDriver.java |  3 +++
 .../impl/ProduceshiftorderServiceImpl.java    |  2 +-
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java
index 9131d938..5c0063ae 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java
@@ -482,6 +482,7 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
                         TaskDto taskDto = taskserver.findByCodeFromCache(inst.getTask_code());
                         if (taskDto != null) {
                             taskDto.setExt_param(new HashMap<>());
+                            taskDto.setTask_status(StatusEnum.TASK_RUNNING.getCode());
                             taskDto.getExt_param().put("inbox", "" + docking_barcode);
                             taskDto.setVehicle_code(String.valueOf(docking_barcode));
                             taskserver.update(taskDto);
@@ -535,12 +536,12 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
                     this.noFeedAgvMessage = this.replace(noFeedMessage);
                 }
             } else if (agvphase == 0x10 || agvphase == 0x27) {
+                Map<String, Object> map = new LinkedHashMap<>();
+                map.put("to_agv_get_finish", "1");
+                map.put("to_agv_put_finish", "0");
+                this.writing(map);
                 //agv取空框1完毕或取空框2完毕
-                if (mode == 1 && move == 0 && ObjectUtil.isNotEmpty(inst)) {
-                    Map<String, Object> map = new LinkedHashMap<>();
-                    map.put("to_agv_get_finish", "1");
-                    map.put("to_agv_put_finish", "0");
-                    this.writing(map);
+                if (mode == 1 && move == 0 && task_finish == 1 && ObjectUtil.isNotEmpty(inst)) {
                     inst.setExecute_status(InstActionEnum.EXECUTE_GET_EMPTY_FINISH.getCode());
                     instructionService.update(inst);
                     byte[] data = agvService.sendAgvTwoModeInst(agvphase, index, 0);
@@ -558,6 +559,11 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
                                     .findFirst()
                                     .orElse(null);
                             if (instruction != null) {
+                                try {
+                                    Thread.sleep(100);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
                                 instructionService.issuedCacheInfo(instruction);
                                 logServer.deviceExecuteLog(device_code, "", "", "第一条指令完成,指令号:'" + inst.getInstruction_code() + "',下发第二条指令,指令号:'" + instruction.getInstruction_code() + "'");
                             }
@@ -632,6 +638,11 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
                     Map<String, Object> map = new LinkedHashMap<>();
                     map.put("to_agv_get_finish", "1");
                     if (task == 0 || Integer.parseInt(inst.getTask_code()) == task) {
+                        try {
+                            Thread.sleep(100);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
                         map.put("to_task_finish", "1");
                     }
                     this.writing(map);
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java
index 57db38ab..d1fc1214 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java
@@ -330,7 +330,7 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl
             map.put("to_confirm_finished", "1");
         }
         //map.put("to_order", "0");
-        map.put("to_clear", "1");
+        //map.put("to_clear", "1");
         this.writing(map);
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java
index 7b68c90b..16ad9df6 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java
@@ -287,6 +287,9 @@ public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDevice
             redisUtils.setExpire(this.device_code, null, ApplyTaskTime.APPLY_TIME, TimeUnit.SECONDS);
             //判断是否需要AGV搬运 需要就申请任务 不需要不申请
             ProduceshiftorderDto produceshiftorderDto = produceshiftorderService.findByCodeFromCache(String.valueOf(this.getOrder()));
+            if (produceshiftorderDto == null) {
+                produceshiftorderDto = produceshiftorderService.findByCode(String.valueOf(this.getOrder()));
+            }
             if (produceshiftorderDto != null && StrUtil.equals(produceshiftorderDto.getIs_needmove(), StatusEnum.NEED_MOVE.getCode())) {
                 JSONObject reqParam = new JSONObject();
                 reqParam.put("device_code", this.getDevice_code());
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java
index 2a2a8962..549b3936 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java
@@ -304,7 +304,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
             map.put("to_confirm_finished", "1");
         }
         //map.put("to_order", "0");
-        map.put("to_clear", "1");
+        //map.put("to_clear", "1");
         this.writing(map);
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java
index 5702b9f1..44d89a71 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java
@@ -291,6 +291,9 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri
             //判断是否需要AGV搬运 需要就申请任务 不需要不申请
             JSONObject reqParam = new JSONObject();
             ProduceshiftorderDto produceshiftorderDto = produceshiftorderService.findByCodeFromCache(String.valueOf(this.getOrder()));
+            if (produceshiftorderDto == null) {
+                produceshiftorderDto = produceshiftorderService.findByCode(String.valueOf(this.getOrder()));
+            }
             if (produceshiftorderDto != null && StrUtil.equals(produceshiftorderDto.getIs_needmove(), StatusEnum.NEED_MOVE.getCode())) {
                 reqParam.put("type", StatusEnum.FULL_REQ.getCode());
                 reqParam.put("device_code", this.getDevice_code());
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
index c21b1461..75d234b0 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
@@ -147,7 +147,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
     @Override
     public ProduceshiftorderDto findByCode(String code) {
         WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder");
-        JSONObject json = wo.query("order_code ='" + code + "' and is_deleted = '0'").uniqueResult(0);
+        JSONObject json = wo.query("order_code ='" + code + "' and is_deleted = '0'","create_time").uniqueResult(0);
         if (ObjectUtil.isEmpty(json)) {
             return null;
         }

From 32fd5187ad69df1318d4c0786e791e69b2fcbed2 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Fri, 9 Jun 2023 12:49:19 +0800
Subject: [PATCH 14/19] =?UTF-8?q?rev:=E8=B0=83=E5=BA=A6=EF=BC=9A=E6=B7=B1?=
 =?UTF-8?q?=E5=9D=91=E7=89=A9=E6=96=99=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/ext/acs/rest/AcsToWmsController.java  |  9 ++++++
 .../acs/service/impl/AcsToWmsServiceImpl.java |  6 +++-
 .../rest/AgvBigScreenController.java          |  2 --
 .../bigScreen/rest/BigScreenController.java   |  7 -----
 .../rest/DeviceScreenController.java          |  9 ------
 .../ext/bigScreen/rest/ProductController.java | 12 ++------
 .../device/SpecialDeviceController.java       |  1 +
 .../PdmProduceWorkorderController.java        | 14 +++++++++-
 .../ProduceshiftorderController.java          |  7 ++++-
 .../sch/tasks/SpeMachinery/SpeEmpTask.java    |  1 +
 .../sch/tasks/SpeMachinery/SpeFullTask.java   |  2 +-
 .../product_manage/sch/wql/QSCH_TASK_01.wql   |  4 +++
 .../device/dao/mapper/PdmBiDeviceMapper.xml   | 10 +++----
 .../device/impl/PdmBiDeviceServiceImpl.java   |  3 +-
 .../xml/PdmProduceWorkorderrecordMapper.xml   |  6 ++++
 .../service/workorder/dto/ReportQuery.java    |  1 +
 .../impl/IPdmProduceWorkorderServiceImpl.java | 17 ++++++++---
 .../resources/config/application-dev3.yml     |  4 +--
 .../src/main/resources/logback-spring.xml     | 28 +++++++++++++++++++
 .../device_manage/deviceMaterial/index.vue    |  4 +--
 .../workorder/produceshiftorder.js            |  2 +-
 .../views/wms/scheduler_manage/task/index.vue | 13 +++++++--
 22 files changed, 112 insertions(+), 50 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
index 847697f4..9527822f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
@@ -100,6 +100,15 @@ public class AcsToWmsController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/feedDeviceQty2")
+    @ApiOperation("反馈深坑数量")
+    @SaIgnore
+    @Log("反馈深坑数量")
+    public ResponseEntity<Object> feedDeviceRealQty2(@RequestBody Map param) {
+        acsToWmsService.feedDevQty(param);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
     @PostMapping("/feedCacheLineBarcodes")
     @Log("向wms反馈缓存载具信息")
     @ApiOperation("向wms反馈缓存载具信息")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 7055b90f..2e198fc8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -41,6 +41,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
@@ -257,14 +258,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
     @Override
     @Async
     public void feedDevQty(Map param) {
-        WQLObject deviceTab = WQLObject.getWQLObject("pdm_bi_device");
         if (CollectionUtils.isEmpty(param)){
             return;
         }
+        log.info("反馈设备数量接口:{}", JSONObject.toJSONString(param));
         Iterator iterator = param.keySet().iterator();
         while (iterator.hasNext()){
             String deviceCode = (String)iterator.next();
             if (!StringUtils.isEmpty(deviceCode)){
+                if (deviceCode.contains("SKQX")){
+                    continue;
+                }
                 Map item = (Map)param.get(deviceCode);
                 Object qty = item.get("qty");
                 Object weight = item.get("weight");
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java
index c3b8b341..91c4e64b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java
@@ -30,14 +30,12 @@ public class AgvBigScreenController {
     private final AgvBigScreenService agvBigScreenService;
 
     @PostMapping("/getTask")
-    @Log("查询任务")
     @ApiOperation("查询任务")
     public ResponseEntity<Object> getData(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(agvBigScreenService.getTask(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/getAgvMsg")
-    @Log("查询车辆信息")
     @ApiOperation("查询车辆信息")
     public ResponseEntity<Object> getAgvMsg(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(agvBigScreenService.getAgvMsg(whereJson), HttpStatus.OK);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java
index 8a0540ff..27e350ea 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java
@@ -29,20 +29,17 @@ import java.util.Map;
 public class BigScreenController {
    private final BigScreenService bigScreenService;
     @PostMapping("/zk")
-    @Log("查询中控室监控大屏")
     @ApiOperation("查询中控室监控大屏")
     public ResponseEntity<Object> getData(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(bigScreenService.getData(whereJson), HttpStatus.OK);
     }
     @PostMapping("/query3Dcartoon")
-    @Log("查询三维动画大屏")
     @ApiOperation("查询三维动画大屏")
     public ResponseEntity<Object> query3Dcartoon(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(bigScreenService.query3Dcartoon(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/workScreen")
-    @Log("查询工序看板")
     @ApiOperation("查询工序看板")
     public ResponseEntity<Object> workScreen(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(bigScreenService.workScreen(whereJson), HttpStatus.OK);
@@ -50,14 +47,12 @@ public class BigScreenController {
 
 
     @GetMapping("/queryInfo")
-    @Log("查询中控室监控大屏手动设置数据")
     @ApiOperation("查询中控室监控大屏手动设置数据")
     public ResponseEntity<Object> queryInfo(@RequestParam Map whereJson, Pageable page) {
         return new ResponseEntity<>(bigScreenService.queryInfo(whereJson,page), HttpStatus.OK);
     }
 
     @PostMapping("/add")
-    @Log("手动添加监控大屏数据")
     @ApiOperation("手动添加监控大屏数据")
     public ResponseEntity<Object> add(@RequestBody JSONObject param) throws Exception {
         bigScreenService.add(param);
@@ -66,7 +61,6 @@ public class BigScreenController {
 
 
     @PutMapping("/edit")
-    @Log("手动修改监控大屏数据")
     @ApiOperation("手动修改监控大屏数据")
     public ResponseEntity<Object> edit(@RequestBody JSONObject param) throws Exception {
         bigScreenService.edit(param);
@@ -74,7 +68,6 @@ public class BigScreenController {
     }
 
     @DeleteMapping("/del")
-    @Log("手动删除监控大屏数据")
     @ApiOperation("手动删除监控大屏数据")
     public ResponseEntity<Object> del(@RequestBody Long[] ids) throws Exception {
         bigScreenService.del(ids);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
index dd3ea843..c7a6a530 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
@@ -25,28 +25,24 @@ public class DeviceScreenController {
     private final DeviceScreenService deviceScreenService;
 
     @PostMapping("/deviceStatus")
-    @Log("设备实时状态")
     @ApiOperation("设备实时状态")
     public ResponseEntity<Object> getData(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(deviceScreenService.deviceStatus(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/oeeAndTeep")
-    @Log("设备综合效率OEE&产能利用效率TEEP")
     @ApiOperation("设备综合效率OEE&产能利用效率TEEP")
     public ResponseEntity<Object> oeeAndTeep(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(deviceScreenService.oeeAndTeep(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/queryDeviceByWork")
-    @Log("运行设备大类产能比")
     @ApiOperation("运行设备大类产能比")
     public ResponseEntity<Object> queryDeviceByWork(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(deviceScreenService.queryDeviceByWork(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/deviceErrorNum")
-    @Log("设备TOP10故障次数")
     @ApiOperation("设备TOP10故障次数")
     public ResponseEntity<Object> deviceErrorNum(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(deviceScreenService.deviceErrorNum(whereJson), HttpStatus.OK);
@@ -60,35 +56,30 @@ public class DeviceScreenController {
     }
 
     @PostMapping("/deviceCensus")
-    @Log("设备综合统计")
     @ApiOperation("设备综合统计")
     public ResponseEntity<Object> deviceCensus(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(deviceScreenService.deviceCensus(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/deviceErrorInfo")
-    @Log("设备报警信息")
     @ApiOperation("设备报警信息")
     public ResponseEntity<Object> deviceErrorInfo(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(deviceScreenService.deviceErrorInfo(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/deviceUseRate")
-    @Log("设备产能利用")
     @ApiOperation("设备产能利用")
     public ResponseEntity<Object> deviceUseRate(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(deviceScreenService.deviceUseRate(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/deviceStatusList")
-    @Log("设备状态列表")
     @ApiOperation("设备状态列表")
     public ResponseEntity<Object> deviceStatusList(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(deviceScreenService.deviceStatusList(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/errCensus")
-    @Log("近30天设备故障统计")
     @ApiOperation("近30天设备故障统计")
     public ResponseEntity<Object> errCensus(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(deviceScreenService.errCensus(whereJson), HttpStatus.OK);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
index c30d21a1..8669419a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
@@ -29,55 +29,47 @@ import java.util.Map;
 @RequestMapping("/api/bigscreen/product")
 @SaIgnore
 @Slf4j
-public class ProductController {
+public class ProductController<x> {
 
     private final ProductService pdaBindingService;
 
     @PostMapping("/planReached")
-    @Log("计划达成")
     @ApiOperation("计划达成")
     public ResponseEntity<Object> planReached(@RequestBody Map<String, String> param) {
         return new ResponseEntity<>(pdaBindingService.planReached(param), HttpStatus.OK);
     }
     @PostMapping("/productSchedule")
-    @Log("今日排产生产进度跟踪")
     @ApiOperation("今日排产生产进度跟踪")
     public ResponseEntity<Object> productSchedule(@RequestBody Map<String, String> param) {
         return new ResponseEntity<>(pdaBindingService.productSchedule(param), HttpStatus.OK);
     }
     @PostMapping("/output")
-    @Log("今日产量")
     @ApiOperation("今日产量")
     public ResponseEntity<Object> output(@RequestBody Map<String, String> param) {
         return new ResponseEntity<>(pdaBindingService.output(param), HttpStatus.OK);
     }
 
     @PostMapping("/worksectionHarvest")
-    @Log("近一周工段产量")
     @ApiOperation("近一周工段产量")
     public ResponseEntity<Object> worksectionHarvest(@RequestBody Map<String, String> param) {
         return new ResponseEntity<>(pdaBindingService.worksectionHarvest(param), HttpStatus.OK);
     }
     @PostMapping("/topHarvest")
-    @Log("今日Top10产量")
     @ApiOperation("今日Top10产量")
     public ResponseEntity<Object> topHarvest(@RequestBody Map<String, String> param) {
         return new ResponseEntity<>(pdaBindingService.topHarvest(param), HttpStatus.OK);
     }
     @PostMapping("/monthHarvest")
-    @Log("30天产量走势")
-    @ApiOperation("30天产量走势")
+   @ApiOperation("30天产量走势")
     public ResponseEntity<Object> monthHarvest(@RequestBody Map<String, String> param) {
         return new ResponseEntity<>(pdaBindingService.monthHarvest(param), HttpStatus.OK);
     }
     @PostMapping("/unfinishOrder")
-    @Log("今日未完成订单")
     @ApiOperation("今日未完成订单")
     public ResponseEntity<Object> unfinishOrder(@RequestBody Map<String, String> param) {
         return new ResponseEntity<>(pdaBindingService.unfinishOrder(param), HttpStatus.OK);
     }
     @PostMapping("/monthOrder")
-    @Log("30天生产订单分布")
     @ApiOperation("30天生产订单分布")
     public ResponseEntity<Object> monthOrder(@RequestBody Map<String, String> param) {
         return new ResponseEntity<>(pdaBindingService.monthOrder(param), HttpStatus.OK);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
index 159e64c8..0873e11b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
@@ -72,6 +72,7 @@ public class SpecialDeviceController {
             iDeviceService.update(new UpdateWrapper<PdmBiDevice>()
                     .set("material_id",query.getString("material_id"))
                     .set("deviceinstor_qty",query.getBigDecimal("deviceinstor_qty"))
+                    .set("deviceinstor_weight",query.getBigDecimal("deviceinstor_weight"))
                     .eq("device_code",device_code));
         }
         return new ResponseEntity<>(HttpStatus.OK);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
index b5cf33bd..e81e0302 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
@@ -146,15 +146,27 @@ public class PdmProduceWorkorderController {
 
 
     @PostMapping("/reportQuery")
-    @Log("报工数修改")
+    @Log("一体机报工数修改")
     @ApiOperation("报工数修改")
     @SaIgnore
     public ResponseEntity<Object> reportQuery(@RequestBody ReportQuery param) {
+        if (!SecurityUtils.getCurrentUserId().equals("1")){
+            param.setUser_id(SecurityUtils.getCurrentUserId());
+        }
+        return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)),HttpStatus.OK);
+    }
+
+    @PostMapping("/reportQuery2")
+    @Log("报工数修改")
+    @ApiOperation("报工数修改")
+    @SaIgnore
+    public ResponseEntity<Object> reportQuery2(@RequestBody ReportQuery param) {
         return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)),HttpStatus.OK);
     }
 
 
 
 
+
 }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
index 62a79b47..25dee9b7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
@@ -77,6 +77,9 @@ public class ProduceshiftorderController{
           if(null == param) {
                throw new BizCoreException(ResultCode.VALIDATE_FAILED);
           }
+          if (!SecurityUtils.getCurrentUserId().equals("1")){
+               param.put("optuser",SecurityUtils.getCurrentUserId());
+          }
           List<Map> list = iPdmProduceWorkorderService.getOrderList(param, page);
           return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
      }
@@ -91,7 +94,9 @@ public class ProduceshiftorderController{
           }
           /** @see org.nl.common.enums.WorkerOrderEnum */
           param.put("workorder_status","'2','3','4'");
-          param.put("optuser",SecurityUtils.getCurrentUserId());
+          if (!SecurityUtils.getCurrentUserId().equals("1")){
+               param.put("optuser",SecurityUtils.getCurrentUserId());
+          }
           List<Map> list = iPdmProduceWorkorderService.getOrderList(param, page);
           return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
      }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
index a429274c..c3a1ea7a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
@@ -113,6 +113,7 @@ public class SpeEmpTask extends AbstractAcsTask {
                 "","product_area",one.getProduct_area(),"quantity", param.getString("quantity"),"type",AcsTaskEnum.TASK_CACHELINE_OUT.getCode(),"material_id", one.getMaterial_id()));
         String taskId = IdUtil.getStringId();
         JSONObject task = packageParam(form, taskId);
+        task.put("table_fk_id",param.getString("workorder_code"));
         taskService.save(task.toJavaObject(SchBaseTask.class));
 
         return taskId;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
index 4d1925b6..e118633d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
@@ -108,9 +108,9 @@ public class SpeFullTask extends AbstractAcsTask {
         JSONObject form = new JSONObject(MapOf.of("start_point_code",point_code,
                 "next_point_code","","return_point_code", empPoint.getString("point_code"),"vehicle_code",
         "","product_area",order.getProduct_area(),"quantity", quantity,"type",AcsTaskEnum.TASK_PRODUCT_MAC.getCode(),"material_id", order.getMaterial_id()));
-
         String taskId = IdUtil.getStringId();
         JSONObject task = packageParam(form, taskId);
+        task.put("table_fk_id",param.getString("workorder_code"));
         taskService.save(task.toJavaObject(SchBaseTask.class));
         return taskId;
     }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql
index 7eaa46ef..cb9520f5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql
@@ -52,6 +52,9 @@
 		PAGEQUERY
                 SELECT
                     task.*,
+                    mb.material_name,
+                    mb.material_spec,
+                    mb.material_code,
                     md.class_name task_type_name,
                     DICT.label task_status_name,
                     reg1.region_name as point1_region_name,
@@ -61,6 +64,7 @@
                 FROM
                     sch_base_task task
                     LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
+                    left join md_me_materialbase mb on mb.material_id = task.material_id
                     LEFT JOIN SYS_DICT DICT ON DICT.`VALUE` = TASK.TASK_STATUS AND DICT.`CODE` = 'TASK_STATUS'
                     LEFT JOIN SCH_BASE_Region reg1 ON reg1.region_code = (
                         SELECT p1.region_code FROM SCH_BASE_Point p1 WHERE p1.point_code = task.point_code1
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 72d62b99..df9d90ee 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
@@ -33,25 +33,23 @@
         <if test="material_id != null and material_id != ''">
             and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '')
         </if>
-        <if test="spec != null and spec != ''">
-            and (pdm_bi_device.spec = #{spec} or pdm_bi_device.spec is null)
-        </if>
         GROUP BY pdm_bi_device.device_code
         HAVING currentQty > #{qty}
     </select>
 
     <select id="workproceduceDevicesWeight" resultType="java.util.Map">
         select
-        GROUP_CONCAT(sch_base_task.task_id) as tasks,GROUP_CONCAT(sch_base_task.material_id) as materials,pdm_bi_device.inupperlimit_qty,pdm_bi_device.deviceinstor_weight,
-        pdm_bi_device.inupperlimit_qty - ifnull( sum( sch_base_task.material_qty*md_me_materialbase.net_weight), 0 ) - pdm_bi_device.deviceinstor_weight AS currentQty,
+        GROUP_CONCAT(sch_base_task.task_id) as tasks,GROUP_CONCAT(sch_base_task.material_id) as materials,GROUP_CONCAT(md_me_materialbase.net_weight) as weights,
+        pdm_bi_device.inupperlimit_qty - ifnull( sum( sch_base_task.material_qty*md_me_materialbase.net_weight ), 0 ) - pdm_bi_device.deviceinstor_qty AS currentQty,
         pdm_bi_device.device_code,
         sch_base_point.point_code
         from sch_base_point
         left join pdm_bi_device on pdm_bi_device.device_code = sch_base_point.device_code
         left JOIN sch_base_task ON sch_base_point.point_code = point_code2 and '7' > task_status
-        left join md_me_materialbase on sch_base_task.material_id = md_me_materialbase.material_id
+        LEFT JOIN md_me_materialbase ON sch_base_task.material_id = md_me_materialbase.material_id
         where
         sch_base_point.point_type = '4' and pdm_bi_device.is_used = true
+        AND pdm_bi_device.is_used = true
         and workprocedure_id = #{workprocedure_id}
         <if test="material_id != null and material_id != ''">
             and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '')
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/impl/PdmBiDeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/impl/PdmBiDeviceServiceImpl.java
index 9769f47d..93206e69 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/impl/PdmBiDeviceServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/impl/PdmBiDeviceServiceImpl.java
@@ -12,6 +12,7 @@ import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -45,7 +46,7 @@ public class PdmBiDeviceServiceImpl extends ServiceImpl<PdmBiDeviceMapper, PdmBi
     public List<Map> workproceduceDevicesWeight(Map<String, Object> param) {
         //#{workprocedure_id} //material_id //#{qty}
         MdMeMaterialbase one = iMdMeMaterialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_id", param.get("material_id")));
-        param.put("qty",one.getNet_weight().doubleValue()*(int)param.get("qty"));
+        param.put("qty",new BigDecimal(Double.valueOf((String)param.get("qty"))).multiply(one.getNet_weight()));
         return this.baseMapper.workproceduceDevicesWeight(param);
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml
index 86e6386e..a018a7db 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml
@@ -28,9 +28,15 @@
         <if test="query.start_time != null and query.start_time != ''">
             and wr.realproducestart_date >=  #{query.start_time}
         </if>
+        <if test="query.start_time != null and query.start_time != ''">
+            and wr.realproducestart_date >=  #{query.start_time}
+        </if>
         <if test="query.end_time != null and query.end_time != ''">
             and  #{query.end_time} >= wr.realproducestart_date
         </if>
+        <if test="query.user_id != null and query.user_id != ''">
+            and  wr.current_produce_person_id = #{query.user_id}
+        </if>
         order by workorder_code desc,seq_number asc
     </select>
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java
index 58993dec..02e621f7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java
@@ -22,6 +22,7 @@ public class ReportQuery  {
     private String report;
     private String start_time;
     private String end_time;
+    private String user_id;
     private Boolean is_report =false;
     private String report_status;
 
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 290d582a..c498872c 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
@@ -69,6 +69,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
 import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -210,7 +211,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         JSONArray array = new JSONArray();
         JSONObject map = new JSONObject();
         map.put("workorder_id", workorder_id);
-        map.put("type", WorkerOrderEnum.FORCE_COMPLETE.getCode());
+        map.put("type", WorkerOrderEnum.COMPLETE.getCode());
         array.add(map);
         Map<String, Object> result = wmsToAcsService.orderStatusUpdate(array);
         if (!HttpStatus.OK.equals(result.get("status"))) {
@@ -250,7 +251,8 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                 String produce_date = "";
                 // 循环获取的数据
                 List<PdmProduceWorkorder> data = new ArrayList<>();
-                row:
+            Map<String,String> errorMap = new HashMap();
+            row:
                 for (int i = 0; i < read.size(); i++) {
                     List<Object> list = read.get(i);
                     if (ObjectUtil.isEmpty(list)) {
@@ -275,7 +277,6 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                     workorder.setCreate_name("导入订单");
                     workorder.setCreate_type(StatusEnum.EXCELINTO.getCode());
 
-                    Map<String,String> errorMap = new HashMap();
                     for (int j = 0; j < list.size(); j++) {
                         String col = String.valueOf(list.get(j));
                         解析cell:{ //如果是第一行 为生产日期
@@ -302,7 +303,9 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                                     errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
                                     error_message = error_message + col + "物料规格对应物料信息不存在，";
                                 } else {
-                                    Optional<MdMeMaterialbase> first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S") && !mdMeMaterialbase.getMaterial_code().contains("TH")).findFirst();
+                                    Optional<MdMeMaterialbase> first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S")
+                                            && Pattern.matches("^[0-9]*$", mdMeMaterialbase.getMaterial_name().substring(mdMeMaterialbase.getMaterial_name().length() - 1))
+                                    ).findFirst();
                                     if (!first.isPresent()) {
                                         errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
                                     }
@@ -452,6 +455,12 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         workorder.setReport_qty(workorder.getReport_qty().add(param.getBigDecimal("report_qty")));
         if (workorder.getPlan_qty().doubleValue() <= workorder.getReport_qty().doubleValue()) {
             workorder.setWorkorder_status(WorkerOrderEnum.COMPLETE.getCode());
+            JSONArray array = new JSONArray();
+            JSONObject map = new JSONObject();
+            map.put("workorder_id", workorder.getWorkorder_id());
+            map.put("type", WorkerOrderEnum.COMPLETE.getCode());
+            array.add(map);
+            wmsToAcsService.orderStatusUpdate(array);
         }
         workorder.setReal_qty(null);
         this.updateById(workorder);
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
index ca24e5fc..308d1e43 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
@@ -24,10 +24,10 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       #      password: ${DB_PWD:123456}
-      password: ${DB_PWD:942464Yy}
+      password: ${DB_PWD:123456}
 
       # 初始连接数
       initial-size: 5
diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
index 6dc32a33..7f2c8ca5 100644
--- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -145,6 +145,34 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>
+    <springProfile name="dev3">
+        <root level="info">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="esLogAppender"/>
+        </root>
+
+        <logger name="jdbc.audit" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.resultset" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="springfox.documentation" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.sqltiming" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="org.jinterop" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+    </springProfile>
     <springProfile name="prod">
         <root level="info">
             <appender-ref ref="CONSOLE"/>
diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
index 6605f899..0f1a3a2f 100644
--- a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
+++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
@@ -64,11 +64,11 @@
         </el-table-column>
         <el-table-column prop="material_name" label="物料名称" width="200px" show-overflow-tooltip />
         <el-table-column prop="material_spec" label="物料规格" width="200px" show-overflow-toolti />
-        <el-table-column prop="deviceinstor_qty" label="深坑物料数量" align="center" width="120px" show-overflow-tooltip>
+        <el-table-column prop="deviceinstor_qty" label="物料数量(单位:个)" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.deviceinstor_qty" /></template>
         </el-table-column>
-        <el-table-column prop="deviceinstor_weight" label="深坑物料数量" align="center" width="120px" show-overflow-tooltip>
+        <el-table-column prop="deviceinstor_weight" label="物料重量(单位:g)" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.deviceinstor_weight" /></template>
         </el-table-column>
diff --git a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js
index 8f36e8bd..af73563c 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js
+++ b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js
@@ -105,7 +105,7 @@ export function getReportWork(data) {
 
 export function reportQuery(data) {
   return request({
-    url: '/api/produceWorkorder/reportQuery',
+    url: '/api/produceWorkorder/reportQuery2',
     method: 'post',
     data
   })
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 3b962ae6..eec68927 100644
--- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue
+++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue
@@ -109,7 +109,7 @@
             <el-select
               v-model="task_status"
               multiple
-              style="width: 400px"
+              style="width: 200px"
               placeholder="任务状态"
               class="filter-item"
               clearable
@@ -129,6 +129,13 @@
           </el-form-item>
 
           <rrOperation />
+          <el-form-item label="未完结任务数">
+          <el-input
+            v-model="undo"
+            clearable
+            style="width: 180px"
+          />
+          </el-form-item>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -144,13 +151,14 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="50" />
+        <el-table-column prop="product_area" label="生产车间" />
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="table_fk_id" label="业务编码" min-width="100" show-overflow-tooltip />
         <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
         <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop = "acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter = "acsTypeName"></el-table-column>
         <el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
-        <el-table-column prop="product_area" label="生产车间" />
         <el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
         <el-table-column prop="point_code1" label="起点" width="100" />
         <el-table-column prop="point1_region_name" label="起点区域" width="120" />
@@ -273,6 +281,7 @@ export default {
       fullscreen: false,
       currentComponent: '',
       openParam: {},
+      undo: 0,
       create_time: [],
       task_status: ['-1'],
       taskStatusList: [],

From 594eede6ce474f1d9d5535b39dd10ba5c477be23 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Fri, 9 Jun 2023 19:33:51 +0800
Subject: [PATCH 15/19] =?UTF-8?q?add=20=E5=8F=96=E6=B6=88=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=E6=B8=85=E9=99=A4phase=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hailiang_one/RemoveDevicePhase.java       | 11 ++++++
 .../HailiangAutoCacheLineDeviceDriver.java    |  3 +-
 ...ningMachineStorageStationDeviceDriver.java | 37 +++++++++++++------
 .../HailiangEngravingMachineDeviceDriver.java |  3 +-
 .../HailiangOldSpecialDeviceDriver.java       | 10 +++--
 ...angOldSpecialEmptyStationDeviceDriver.java |  3 +-
 ...iangOldSpecialFullStationDeviceDriver.java |  9 +++--
 ...iangOldSpecialPourStationDeviceDriver.java |  3 +-
 .../HailiangPackerStationDeviceDriver.java    |  3 +-
 .../HailiangSpecialDeviceDriver.java          | 31 ++++++++++++----
 ...iliangSpecialEmptyStationDeviceDriver.java |  3 +-
 ...ailiangSpecialFullStationDeviceDriver.java |  9 +++--
 ...ailiangSpecialPourStationDeviceDriver.java |  3 +-
 .../acs/ext/wms/service/AcsToWmsService.java  |  8 ++++
 .../wms/service/impl/AcsToWmsServiceImpl.java | 27 ++++++++++++++
 .../service/impl/InstructionServiceImpl.java  | 31 +++++++++-------
 .../modules/quartz/task/AutoCreateInst.java   |  6 +--
 17 files changed, 146 insertions(+), 54 deletions(-)
 create mode 100644 wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/RemoveDevicePhase.java

diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/RemoveDevicePhase.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/RemoveDevicePhase.java
new file mode 100644
index 00000000..ceece3bf
--- /dev/null
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/RemoveDevicePhase.java
@@ -0,0 +1,11 @@
+package org.nl.acs.device_driver.basedriver.hailiang_one;
+
+import org.nl.acs.instruction.service.dto.Instruction;
+
+/**
+ * @author: geng by
+ * @createDate: 2023/6/9
+ */
+public interface RemoveDevicePhase {
+    public void set(int agvphase, int index, Instruction inst);
+}
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java
index 5c0063ae..13909923 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java
@@ -15,6 +15,7 @@ import org.nl.acs.agv.server.impl.NDCAgvServiceImpl;
 import org.nl.acs.auto.run.NDCSocketConnectionAutoRun;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
@@ -41,7 +42,7 @@ import java.util.*;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
+public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
     @Autowired
     InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class);
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java
index 538bee80..5fa240d2 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java
@@ -12,8 +12,11 @@ import org.nl.acs.auto.run.NDCSocketConnectionAutoRun;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.ext.wms.service.AcsToWmsService;
+import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
 import org.nl.acs.history.ErrorUtil;
 import org.nl.acs.history.service.DeviceErrorLogService;
 import org.nl.acs.history.service.dto.DeviceErrorLogDto;
@@ -39,7 +42,7 @@ import java.util.Map;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
+public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
     @Autowired
     InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class);
@@ -51,6 +54,8 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO
     DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
     @Autowired
     TaskService taskserver = SpringContextHolder.getBean(TaskService.class);
+    @Autowired
+    AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class);
 
     int mode = 0;
     //储料仓运行中
@@ -140,10 +145,14 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号is_open：" + last_is_open + "->" + is_open);
             }
             if (silo_weight != last_silo_weight) {
-                Map<String, Integer> feedNumMap = new HashMap<>();
-                feedNumMap.put("qty", this.getFull_number());
-                feedNumMap.put("weight", this.getSilo_weight());
-                MonitoringLargeScreenData.deviceNumData.put(this.device_code, feedNumMap);
+                if (is_open == 1) {
+                    Map<String, Integer> feedNumMap = new HashMap<>();
+                    feedNumMap.put("qty", this.getFull_number());
+                    feedNumMap.put("weight", this.getSilo_weight());
+                    Map<String, Map<String, Integer>> fm = new HashMap<>();
+                    fm.put(this.device_code, feedNumMap);
+                    acsToWmsService.feedDeviceNum2(fm);
+                }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号silo_weight：" + last_silo_weight + "->" + silo_weight);
             }
             if (full_number != last_full_number) {
@@ -162,16 +171,16 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO
             //this.setIserror(true);
             message = "信号量同步异常";
             //未联机
-        } /*else if (mode == 0) {
+        } else if (mode == 0) {
             message = "未联机";
-        } */ else {
-            this.setIsonline(true);
-            this.setIserror(false);
+        } else {
+            //this.setIsonline(true);
+            //this.setIserror(false);
             message = null;
             //agv到达倒料点
             if (agvphase == 0x0B || agvphase == 0x0F) {
                 //判断储料仓联机、无故障、agv执行执行物料编号和上次倒料编号一致或者上次物料清空才允许倒料
-                if (ObjectUtil.isNotEmpty(inst)) {
+                if (mode == 1 && ObjectUtil.isNotEmpty(inst)) {
                     inst.setExecute_status(InstActionEnum.EXECUTE_TO_PUT_FALL_SEND_FULL.getCode());
                     instructionService.update(inst);
                     byte[] data = agvService.sendAgvTwoModeInst(agvphase, index, 0);
@@ -182,6 +191,9 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO
                     logServer.deviceExecuteLog(device_code, "", "", this.messageInfo(agvphase));
                 } else {
                     String notFeedAgvMessage = "";
+                    if (mode != 1) {
+                        notFeedAgvMessage += "设备未联机,";
+                    }
                     if (inst == null) {
                         notFeedAgvMessage += "AGV指令为空,";
                     }
@@ -191,7 +203,7 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO
 
             //agv倒料完成
             if (agvphase == 0x0D || agvphase == 0x11) {
-                if (ObjectUtil.isNotEmpty(inst)) {
+                if (mode == 1 && ObjectUtil.isNotEmpty(inst)) {
                     //下发储料仓倒料数量及开始称重
                     Map<String, Object> map = new LinkedHashMap<>();
                     map.put("to_dumping_num", inst.getQuantity());
@@ -215,6 +227,9 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO
                     logServer.deviceExecuteLog(device_code, "", "", this.messageInfo(agvphase));
                 } else {
                     String notFeedAgvMessage = "";
+                    if (mode != 1) {
+                        notFeedAgvMessage += "设备未联机,";
+                    }
                     if (inst == null) {
                         notFeedAgvMessage += "AGV指令为空,";
                     }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java
index 3d963e86..0ee89c2b 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java
@@ -17,6 +17,7 @@ import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime;
 import org.nl.acs.device_driver.basedriver.hailiang_one.IssuedDeviceOrderInfo;
 import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
@@ -52,7 +53,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo {
+public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo, RemoveDevicePhase {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
     @Autowired
     InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java
index d1fc1214..a0b0b825 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java
@@ -140,8 +140,10 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
             }
             if (now_order_prod_num != last_now_order_prod_num) {
-                if (mode == 1 && order > 0) {
-                    MonitoringLargeScreenData.orderData.put(String.valueOf(order), now_order_prod_num);
+                if (mode == 1 && order > 0 && order_prod_allnum > 0) {
+                    if (produceshiftorderService.findByCodeFromCache(String.valueOf(order)) != null) {
+                        MonitoringLargeScreenData.orderData.put(String.valueOf(order), now_order_prod_num);
+                    }
                 }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号now_order_prod_num：" + last_now_order_prod_num + "->" + now_order_prod_num);
             }
@@ -329,8 +331,8 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl
         } else {
             map.put("to_confirm_finished", "1");
         }
-        //map.put("to_order", "0");
-        //map.put("to_clear", "1");
+        map.put("to_order", "0");
+        map.put("to_clear", "1");
         this.writing(map);
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java
index 217b6c14..930fdeb5 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java
@@ -11,6 +11,7 @@ import org.nl.acs.agv.server.impl.NDCAgvServiceImpl;
 import org.nl.acs.auto.run.NDCSocketConnectionAutoRun;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.history.ErrorUtil;
@@ -36,7 +37,7 @@ import java.util.HashMap;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangOldSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
+public class HailiangOldSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
     @Autowired
     InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java
index 16ad9df6..62d04366 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java
@@ -14,6 +14,7 @@ import org.nl.acs.auto.run.NDCSocketConnectionAutoRun;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
@@ -47,7 +48,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
+public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
     @Autowired
     InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class);
@@ -287,9 +288,9 @@ public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDevice
             redisUtils.setExpire(this.device_code, null, ApplyTaskTime.APPLY_TIME, TimeUnit.SECONDS);
             //判断是否需要AGV搬运 需要就申请任务 不需要不申请
             ProduceshiftorderDto produceshiftorderDto = produceshiftorderService.findByCodeFromCache(String.valueOf(this.getOrder()));
-            if (produceshiftorderDto == null) {
-                produceshiftorderDto = produceshiftorderService.findByCode(String.valueOf(this.getOrder()));
-            }
+//            if (produceshiftorderDto == null) {
+//                produceshiftorderDto = produceshiftorderService.findByCode(String.valueOf(this.getOrder()));
+//            }
             if (produceshiftorderDto != null && StrUtil.equals(produceshiftorderDto.getIs_needmove(), StatusEnum.NEED_MOVE.getCode())) {
                 JSONObject reqParam = new JSONObject();
                 reqParam.put("device_code", this.getDevice_code());
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java
index 9e5263f1..9f3f29a2 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java
@@ -15,6 +15,7 @@ import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime;
 import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
@@ -49,7 +50,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangOldSpecialPourStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
+public class HailiangOldSpecialPourStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
     @Autowired
     InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java
index 2c38fafa..3714d17e 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java
@@ -18,6 +18,7 @@ import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime;
 import org.nl.acs.device_driver.basedriver.hailiang_one.IssuedDeviceOrderInfo;
 import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
@@ -53,7 +54,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo {
+public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo, RemoveDevicePhase {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
     @Autowired
     InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java
index 549b3936..06e1cad5 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java
@@ -53,6 +53,8 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
     @Autowired
     DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
     LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
+
+    int heartbeat = 0;
     int mode = 0;
     int error = 0;
     int now_one_box_num = 0;
@@ -63,6 +65,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
     int order = 0;
     int order_prod_allnum = 0;
 
+    int last_heartbeat = 0;
     int last_mode = 0;
     int last_error = 0;
     int last_finish = 0;
@@ -97,6 +100,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
     public synchronized void execute() {
         try {
             device_code = this.getDeviceCode();
+            heartbeat = this.itemProtocol.getHeartbeat();
             error = this.itemProtocol.getError();
             order = this.itemProtocol.getOrder();
             mode = this.itemProtocol.getItem_mode();
@@ -137,6 +141,13 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
             }
 
             if (order_compel_finish != last_order_compel_finish) {
+                if (order_compel_finish == 1) {
+                    Map<String, Object> map = new LinkedHashMap<>();
+                    map.put("to_confirm_finished", "1");
+                    map.put("to_clear", "1");
+                    map.put("to_order", "0");
+                    this.writing(map);
+                }
                 luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_order_compel_finish, String.valueOf(this.last_order_compel_finish), String.valueOf(this.order_compel_finish)));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号order_compel_finish：" + last_order_compel_finish + "->" + order_compel_finish);
             }
@@ -145,8 +156,10 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
             }
             if (now_order_prod_num != last_now_order_prod_num) {
-                if (mode == 1 && order > 0) {
-                    MonitoringLargeScreenData.orderData.put(String.valueOf(order), now_order_prod_num);
+                if (mode == 1 && order > 0 && order_prod_allnum > 0) {
+                    if (produceshiftorderService.findByCodeFromCache(String.valueOf(order)) != null) {
+                        MonitoringLargeScreenData.orderData.put(String.valueOf(order), now_order_prod_num);
+                    }
                 }
                 luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_now_order_prod_num, String.valueOf(this.last_now_order_prod_num), String.valueOf(this.now_order_prod_num)));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号now_order_prod_num：" + last_now_order_prod_num + "->" + now_order_prod_num);
@@ -171,6 +184,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
                 feedDeviceStatusFlag = false;
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号isonline：" + last_isonline + "->" + isonline);
             }
+
             if (!this.itemProtocol.getIsonline() && !feedDeviceStatusFlag) {
                 JSONObject chm = new JSONObject();
                 chm.put("device_code", this.getDevice_code());
@@ -189,7 +203,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
                 chm.put("error_code", String.valueOf(error));
                 acsToWmsService.feedDeviceStatusType(chm);
                 feedDeviceStatusFlag = true;
-            } else if (this.itemProtocol.getIsonline() && mode == 1 && order > 0 && !feedDeviceStatusFlag) {
+            } else if (this.itemProtocol.getIsonline() && mode == 1 && order > 0 && order_prod_allnum > 0 && !feedDeviceStatusFlag) {
                 JSONObject chm = new JSONObject();
                 chm.put("device_code", this.getDevice_code());
                 //设备生产中
@@ -198,7 +212,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
                 chm.put("error_code", "0");
                 acsToWmsService.feedDeviceStatusType(chm);
                 feedDeviceStatusFlag = true;
-            } else if (this.itemProtocol.getIsonline() && mode == 0 && order > 0 && !feedDeviceStatusFlag) {
+            } else if (this.itemProtocol.getIsonline() && mode == 0 && order > 0 && order_prod_allnum > 0 && !feedDeviceStatusFlag) {
                 JSONObject chm = new JSONObject();
                 chm.put("device_code", this.getDevice_code());
                 //设备待生产
@@ -230,7 +244,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
             }
 
             //修改工单状态为自动完成
-            if (mode == 1 && finish != last_finish && finish == 1 && order > 0 && now_order_prod_num == order_prod_allnum) {
+            if (mode == 1 && finish != last_finish && finish == 1 && order_compel_finish != 1 && order > 0 && now_order_prod_num == order_prod_allnum) {
                 ProduceshiftorderDto pdto = produceshiftorderService.findByCodeFromCache(String.valueOf(order));
                 if (pdto != null) {
                     if (pdto.getOrder_status().equals(WorkerOrderEnum.PRODUCTING.getCode())) {
@@ -269,6 +283,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
         last_line_stock_num = line_stock_num;
         last_order_prod_allnum = order_prod_allnum;
         last_isonline = isonline;
+        last_heartbeat = heartbeat;
     }
 
 
@@ -299,12 +314,12 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
         Map<String, Object> map = new LinkedHashMap<>();
         if (StrUtil.equals(autoFinish, WorkerOrderEnum.FORCEFINISH.getCode())) {
             map.put("to_order_compel_finished", "1");
-            map.put("to_confirm_finished", "1");
+            //map.put("to_confirm_finished", "1");
         } else {
             map.put("to_confirm_finished", "1");
+            map.put("to_order", "0");
+            map.put("to_clear", "1");
         }
-        //map.put("to_order", "0");
-        //map.put("to_clear", "1");
         this.writing(map);
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java
index 512fd091..f89b1158 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java
@@ -11,6 +11,7 @@ import org.nl.acs.agv.server.impl.NDCAgvServiceImpl;
 import org.nl.acs.auto.run.NDCSocketConnectionAutoRun;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.history.ErrorUtil;
@@ -35,7 +36,7 @@ import java.util.HashMap;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
+public class HailiangSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
     @Autowired
     InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java
index 44d89a71..11c9ac55 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java
@@ -14,6 +14,7 @@ import org.nl.acs.auto.run.NDCSocketConnectionAutoRun;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
@@ -47,7 +48,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
+public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
     @Autowired
     InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class);
@@ -291,9 +292,9 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri
             //判断是否需要AGV搬运 需要就申请任务 不需要不申请
             JSONObject reqParam = new JSONObject();
             ProduceshiftorderDto produceshiftorderDto = produceshiftorderService.findByCodeFromCache(String.valueOf(this.getOrder()));
-            if (produceshiftorderDto == null) {
-                produceshiftorderDto = produceshiftorderService.findByCode(String.valueOf(this.getOrder()));
-            }
+//            if (produceshiftorderDto == null) {
+//                produceshiftorderDto = produceshiftorderService.findByCode(String.valueOf(this.getOrder()));
+//            }
             if (produceshiftorderDto != null && StrUtil.equals(produceshiftorderDto.getIs_needmove(), StatusEnum.NEED_MOVE.getCode())) {
                 reqParam.put("type", StatusEnum.FULL_REQ.getCode());
                 reqParam.put("device_code", this.getDevice_code());
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java
index 0a8241d0..ee150f9d 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java
@@ -15,6 +15,7 @@ import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime;
 import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
@@ -49,7 +50,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
+public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
     @Autowired
     InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
index 3bc7715b..a16d717c 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
@@ -54,6 +54,14 @@ public interface AcsToWmsService {
      */
     HttpResponse feedDeviceNum(Map<String, Map<String,Integer>> map);
 
+    /**
+     * 反馈储料仓料口数量
+     *
+     * @param map
+     * @return
+     */
+    HttpResponse feedDeviceNum2(Map<String, Map<String,Integer>> map);
+
 
     /**
      * 申请扫码器任务
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
index 1baa27bc..d1bea396 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
@@ -201,6 +201,33 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
     }
 
+    @Override
+    public HttpResponse feedDeviceNum2(Map<String, Map<String, Integer>> map) {
+        try {
+            MDC.put(log_file_type, log_type);
+            if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
+                log.info("acs开始向mes反馈储料仓重量和数量,请求参数:{}", JSON.toJSONString(map));
+                String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue();
+                AddressDto addressDto = addressService.findByCode("feedDeviceNum2");
+                String methods_url = addressDto.getMethods_url();
+                String url = wmsUrl + methods_url;
+                HttpResponse result = null;
+                try {
+                    result = HttpRequest.post(url)
+                            .body(JSON.toJSONString(map))
+                            .execute();
+                    log.info("acs向mes反馈储料仓重量和数量成功,请求参数:{},请求路径:{},响应参数:{}", JSON.toJSONString(map), url, JSON.toJSONString(result));
+                } catch (Exception e) {
+                    log.error("acs向mes反馈储料仓重量和数量失败,请求参数:{},请求路径:{},失败原因:{}", JSON.toJSONString(map), url, e.getMessage());
+                }
+                return result;
+            }
+            return null;
+        } finally {
+            MDC.remove(log_file_type);
+        }
+    }
+
     @Override
     public HttpResponse applyScannerTask(JSONObject map) {
         try {
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 933917e0..b6861836 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -18,6 +18,7 @@ import org.nl.acs.agv.server.XianGongAgvService;
 import org.nl.acs.auto.initial.ApplicationAutoInitial;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device.service.impl.DeviceServiceImpl;
+import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase;
 import org.nl.acs.device_driver.basedriver.hailiang_one.hailiang_auto_cache_line.HailiangAutoCacheLineDeviceDriver;
 import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
 import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver;
@@ -1431,20 +1432,24 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
             Device start_device = deviceAppService.findDeviceByCode(start_point_code);
             Device next_device = deviceAppService.findDeviceByCode(next_point_code);
             Device put_device = deviceAppService.findDeviceByCode(put_point_code);
-            HailiangAutoCacheLineDeviceDriver hailiangAutoCacheLineDeviceDriver;
-            if (put_device != null && put_device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
-                hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) put_device.getDeviceDriver();
-                hailiangAutoCacheLineDeviceDriver.set(0, 0, null);
-                if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 && hailiangAutoCacheLineDeviceDriver.getTask() == Integer.parseInt(dto.getInstruction_code())) {
-                    hailiangAutoCacheLineDeviceDriver.writing("to_task_finish", "1");
-                }
+            RemoveDevicePhase removeDevicePhase;
+            if (put_device != null && put_device.getDeviceDriver() instanceof RemoveDevicePhase) {
+                removeDevicePhase = (RemoveDevicePhase) put_device.getDeviceDriver();
+                removeDevicePhase.set(0, 0, null);
+//                if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 && hailiangAutoCacheLineDeviceDriver.getTask() == Integer.parseInt(dto.getInstruction_code())) {
+//                    hailiangAutoCacheLineDeviceDriver.writing("to_task_finish", "1");
+//                }
             }
-            if (start_device != null && next_device != null && start_device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver && next_device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
-                hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) start_device.getDeviceDriver();
-                hailiangAutoCacheLineDeviceDriver.set(0, 0, null);
-                if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 && hailiangAutoCacheLineDeviceDriver.getTask() == Integer.parseInt(dto.getInstruction_code())) {
-                    hailiangAutoCacheLineDeviceDriver.writing("to_task_finish", "1");
-                }
+            if (start_device != null && start_device.getDeviceDriver() instanceof RemoveDevicePhase) {
+                removeDevicePhase = (RemoveDevicePhase) start_device.getDeviceDriver();
+                removeDevicePhase.set(0, 0, null);
+//                if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 && hailiangAutoCacheLineDeviceDriver.getTask() == Integer.parseInt(dto.getInstruction_code())) {
+//                    hailiangAutoCacheLineDeviceDriver.writing("to_task_finish", "1");
+//                }
+            }
+            if (next_device != null && next_device.getDeviceDriver() instanceof RemoveDevicePhase) {
+                removeDevicePhase = (RemoveDevicePhase) put_device.getDeviceDriver();
+                removeDevicePhase.set(0, 0, null);
             }
         }
     }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
index c362fb3d..59916b00 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
@@ -94,7 +94,7 @@ public class AutoCreateInst {
                     Device device = deviceAppService.findDeviceByCode(put_device_code);
                     if (device != null && device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
                         hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) device.getDeviceDriver();
-                        if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(put_device_code) != null) {
+                        if (hailiangAutoCacheLineDeviceDriver.getMode() != 1 || hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(put_device_code) != null) {
                             continue;
                         }
                     }
@@ -105,7 +105,7 @@ public class AutoCreateInst {
                     Device device = deviceAppService.findDeviceByCode(start_device_code);
                     if (device != null && device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
                         hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) device.getDeviceDriver();
-                        if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(start_device_code) != null) {
+                        if (hailiangAutoCacheLineDeviceDriver.getMode() != 1 || hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(start_device_code) != null) {
                             continue;
                         }
                     }
@@ -143,7 +143,7 @@ public class AutoCreateInst {
                     Device device = deviceAppService.findDeviceByCode(taskDto1.getPut_device_code());
                     if (device != null && device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
                         hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) device.getDeviceDriver();
-                        if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(taskDto1.getPut_device_code()) != null) {
+                        if (hailiangAutoCacheLineDeviceDriver.getMode() != 1 || hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(taskDto1.getPut_device_code()) != null) {
                             continue;
                         }
                     }

From dd5cd32d4b00576b2cc65e1a6fe2b05e10409037 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Fri, 9 Jun 2023 21:24:40 +0800
Subject: [PATCH 16/19] =?UTF-8?q?rev:=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/ext/acs/rest/AcsToWmsController.java  |   2 +-
 .../wms/ext/acs/service/AcsToWmsService.java  |   1 +
 .../acs/service/impl/AcsToWmsServiceImpl.java |  23 ++-
 .../device/SpecialDeviceController.java       |   2 +-
 .../PdmProduceWorkorderController.java        |   9 +-
 .../sch/service/impl/TaskServiceImpl.java     |  13 +-
 .../sch/tasks/SpeMachinery/SpeEmpTask.java    |   2 +-
 .../sch/tasks/SpeMachinery/SpeFullTask.java   |   3 +-
 .../product_manage/sch/wql/QSCH_TASK_01.wql   |  14 +-
 .../IPdmProduceWorkorderService.java          |   4 +-
 .../impl/IPdmProduceWorkorderServiceImpl.java | 186 +++++++++---------
 .../controller/task/TaskController.java       |  26 ++-
 .../service/task/ISchBaseTaskService.java     |   3 +
 .../task/dao/mapper/SchBaseTaskMapper.java    |   4 +-
 .../task/dao/mapper/xml/SchBaseTaskMapper.xml |  61 +++++-
 .../service/task/dto/TaskQuery.java           |  12 ++
 .../task/impl/SchBaseTaskServiceImpl.java     |  38 +++-
 .../src/main/resources/config/application.yml |   2 +-
 .../views/wms/scheduler_manage/task/index.vue |  21 +-
 .../views/wms/scheduler_manage/task/task.js   |   9 +-
 20 files changed, 300 insertions(+), 135 deletions(-)
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/TaskQuery.java

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
index 9527822f..5b91a24d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
@@ -105,7 +105,7 @@ public class AcsToWmsController {
     @SaIgnore
     @Log("反馈深坑数量")
     public ResponseEntity<Object> feedDeviceRealQty2(@RequestBody Map param) {
-        acsToWmsService.feedDevQty(param);
+        acsToWmsService.feedDevQty2(param);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
index a721fa7b..3992c8a4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
@@ -60,6 +60,7 @@ public interface AcsToWmsService {
      * @return
      */
     void feedDevQty(Map param);
+    void feedDevQty2(Map param);
 
     /**
      * ACS给WMS反馈设备状态状态
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 2e198fc8..7243ee12 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -79,7 +79,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
             RedissonUtils.lock(()->{
                 //业务处理
                 Task_Collent.get(taskEnum).createTask(param);
-
             },param.getString("type"),5);
         }catch (Exception ex){
             log.error("acs申请任务失败:ex:{}",ex.getMessage());
@@ -282,6 +281,28 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
             }
         }
     }
+    @Override
+    public void feedDevQty2(Map param) {
+        if (CollectionUtils.isEmpty(param)){
+            return;
+        }
+        log.info("反馈设备数量接口:{}", JSONObject.toJSONString(param));
+        Iterator iterator = param.keySet().iterator();
+        while (iterator.hasNext()){
+            String deviceCode = (String)iterator.next();
+            if (!StringUtils.isEmpty(deviceCode)){
+                Map item = (Map)param.get(deviceCode);
+                Object qty = item.get("qty");
+                Object weight = item.get("weight");
+                UpdateWrapper<PdmBiDevice> wrapper = new UpdateWrapper<>();
+                if (weight!=null){
+                    wrapper.set("deviceinstor_weight",weight);
+                    wrapper.eq("device_code",deviceCode);
+                    deviceService.update(wrapper);
+                }
+            }
+        }
+    }
 
     @Override
     public void feedcachelineVe(JSONObject param) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
index 0873e11b..04845b9c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
@@ -75,7 +75,7 @@ public class SpecialDeviceController {
                     .set("deviceinstor_weight",query.getBigDecimal("deviceinstor_weight"))
                     .eq("device_code",device_code));
         }
-        return new ResponseEntity<>(HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
     }
 }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
index e81e0302..eb1d1716 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
@@ -26,8 +27,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -117,8 +118,10 @@ public class PdmProduceWorkorderController {
     @PostMapping("/excelImport")
     @Log("excel导入")
     @ApiOperation("excel导入")
-    public ResponseEntity<Object> excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
-        iPdmProduceWorkorderService.excelImport(file,request);
+    public ResponseEntity<Object> excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
+        RedissonUtils.lock(()->{
+            iPdmProduceWorkorderService.excelImport(file,request, response);
+        },"工单导入",null);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java
index aa52ee08..5c3c1507 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java
@@ -60,13 +60,14 @@ public class TaskServiceImpl implements TaskService {
         }
 
         if (StrUtil.isNotEmpty(whereJson.getString("task_code"))) {
-            map.put("task_code", "%" + whereJson.getString("task_code") + "%");
+            if (whereJson.getString("task_code").length()>13){
+                map.put("task_id", whereJson.getString("task_code"));
+            }else {
+                map.put("task_code", "%" + whereJson.getString("task_code") + "%");
+            }
         }
-        if (StrUtil.isNotEmpty(whereJson.getString("point_code1"))) {
-            map.put("point_code1", "%" + whereJson.getString("point_code1") + "%");
-        }
-        if (StrUtil.isNotEmpty(whereJson.getString("point_code2"))) {
-            map.put("point_code2", "%" + whereJson.getString("point_code2") + "%");
+        if (StrUtil.isNotEmpty(whereJson.getString("point_code"))) {
+            map.put("point_code", "%" + whereJson.getString("point_code1") + "%");
         }
         if (StrUtil.isNotEmpty(whereJson.getString("vehicle_code"))) {
             map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%");
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
index c3a1ea7a..f1abcfa2 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
@@ -105,7 +105,7 @@ public class SpeEmpTask extends AbstractAcsTask {
                 .eq("point_code2", param.getString("device_code")).lt("task_status", StatusEnum.TASK_FINISH.getCode())
         );
         if (!CollectionUtils.isEmpty(list)){
-            throw new BadRequestException(String.format("设备%s存在未完成任务", param.getString("device_code")));
+            throw new BadRequestException(String.format("设备%s存在未完成任务:"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code")));
         }
 
         JSONObject form = new JSONObject(MapOf.of("start_point_code",cahceLine,
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
index e118633d..d652b1af 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
@@ -102,7 +102,7 @@ public class SpeFullTask extends AbstractAcsTask {
                 .eq("point_code1", point_code).lt("task_status", StatusEnum.TASK_FINISH.getCode())
         );
         if (!CollectionUtils.isEmpty(list)){
-            throw new BadRequestException(String.format("设备%s存在未完成任务", param.getString("device_code")));
+            throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code")));
         }
         JSONObject empPoint = WQL.getWO("sch_point").addParamMap(MapOf.of("flag", "2", "point_code", point_code, "point_type", StatusEnum.POINT_LOCATION_EMP.getCode())).process().uniqueResult(0);
         JSONObject form = new JSONObject(MapOf.of("start_point_code",point_code,
@@ -265,6 +265,7 @@ public class SpeFullTask extends AbstractAcsTask {
                         if (!("fall_finish"+task.getTask_id()).equals(one.getRemark())){
                             deviceService.update(new UpdateWrapper<PdmBiDevice>()
                                     .set("material_id", task.getMaterial_id())
+                                    .set("deviceinstor_qty",one.getDeviceinstor_qty().add(task.getMaterial_qty()))
                                     .set("remark","fall_finish"+task.getTask_id())
                                     .eq("device_code", task.getPoint_code2()));
                         }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql
index cb9520f5..0100f0f5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql
@@ -14,12 +14,14 @@
 	##			表字段对应输入参数
 	#################################################
 	输入.flag					                 TYPEAS s_string
-	输入.task_status					         TYPEAS s_string
+	输入.task_status					             TYPEAS s_string
 	输入.finished_type					         TYPEAS s_string
 	输入.task_type					             TYPEAS s_string
-	输入.point_code1					         TYPEAS s_string
-	输入.point_code2					         TYPEAS s_string
+	输入.point_code1					             TYPEAS s_string
+	输入.point_code					             TYPEAS s_string
+	输入.point_code2					             TYPEAS s_string
 	输入.task_code					             TYPEAS s_string
+	输入.task_id				                     TYPEAS s_string
 	输入.product_area					         TYPEAS s_string
 	输入.vehicle_code					         TYPEAS s_string
 	输入.begin_time					             TYPEAS s_string
@@ -95,6 +97,9 @@
                     OPTION 输入.product_area <> ""
                             task.product_area = 输入.product_area
                     ENDOPTION
+                    OPTION 输入.point_code <> ""
+                            ( task.point_code1 = 输入.product_area or task.point_code2 = 输入.product_area)
+                    ENDOPTION
                     OPTION 输入.unFinish <> ""
                             task.task_status <> '7'
                     ENDOPTION
@@ -107,6 +112,9 @@
                     OPTION 输入.task_code <> ""
                          (task.task_code like 输入.task_code)
                     ENDOPTION
+                    OPTION 输入.task_id <> ""
+                         (task.task_id = 输入.task_code)
+                    ENDOPTION
                     OPTION 输入.point_code <> ""
                          (task.point_code1 like 输入.point_code1)
                     ENDOPTION
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
index 0c76a243..300519fb 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
@@ -11,6 +11,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -87,8 +88,9 @@ public interface IPdmProduceWorkorderService extends IService<PdmProduceWorkorde
      * excel导入
      * @param file
      * @param request
+     * @param response
      */
-    void excelImport(MultipartFile file, HttpServletRequest request);
+    void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response);
 
 
     /*----一体及接口---*/
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 c498872c..c2a3f5ed 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
@@ -63,6 +63,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -240,7 +241,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void excelImport(MultipartFile file, HttpServletRequest request) {
+    public void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
         InputStream inputStream = null;
         try {
             inputStream = file.getInputStream();
@@ -248,109 +249,90 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
             //material_spec='24030921S'
                 ExcelReader excelReader = ExcelUtil.getReader(inputStream,"推弯计划表");
                 List<List<Object>> read = excelReader.read();
-                String produce_date = "";
                 // 循环获取的数据
                 List<PdmProduceWorkorder> data = new ArrayList<>();
-            Map<String,String> errorMap = new HashMap();
+            List<Map> errlist = new ArrayList<>();
             row:
-                for (int i = 0; i < read.size(); i++) {
-                    List<Object> list = read.get(i);
-                    if (ObjectUtil.isEmpty(list)) {
-                        continue;
-                    }
-                    //获取每列
-                    JSONObject param = new JSONObject();
-                    //按照列获取
-                    param.put("workorder_id", IdUtil.getStringId());
-                    param.put("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER"));
-                    param.put("workorder_status", WorkerOrderEnum.CREATE.getCode());
-                    param.put("shift_type_scode", StatusEnum.DAYSHIFT.getCode()); // 默认白班
-                    String error_message = "";
-                    PdmProduceWorkorder workorder = new PdmProduceWorkorder();
-                    workorder.setWorkorder_id(IdUtil.getStringId());
-                    workorder.setWorkorder_code(CodeUtil.getNewCode("PDM_SHIFTORDER"));
-                    workorder.setWorkorder_status(WorkerOrderEnum.CREATE.getCode());
-                    workorder.setIs_needmove(true);
-                    workorder.setIs_canupdate_update(true);
-                    workorder.setCreate_time(DateUtil.now());
-                    workorder.setCreate_id(SecurityUtils.getCurrentUserId());
-                    workorder.setCreate_name("导入订单");
-                    workorder.setCreate_type(StatusEnum.EXCELINTO.getCode());
-
-                    for (int j = 0; j < list.size(); j++) {
-                        String col = String.valueOf(list.get(j));
-                        解析cell:{ //如果是第一行 为生产日期
-                            if (i == 0 && j == 0) {
-                                continue row;
-                            }
-                            //如果第一列包含规格二字 则为表头 结束内循环列
-                            if (j == 0 && col.contains("班次")) {
-                                continue row;
-                            }
-                            if (j == 0) {
-                                //物料
-                                workorder.setShift_type_scode(col.equals("晚上") ? "2" : "1");
-                            }
-                            if (j == 1) {
-                                //物料
-                                workorder.setPlanproduceend_date(col.substring(0,col.indexOf(" "))+" 18:30:00");
-                                workorder.setPlanproducestart_date(col.substring(0,col.indexOf(" "))+" 07:30:00");
-                            }
-                            if (j == 2) {
-                                //物料
-                                List<MdMeMaterialbase> material_specs = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().eq("material_spec", col));
-                                if (CollectionUtils.isEmpty(material_specs)) {
-                                    errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
-                                    error_message = error_message + col + "物料规格对应物料信息不存在，";
-                                } else {
-                                    Optional<MdMeMaterialbase> first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S")
-                                            && Pattern.matches("^[0-9]*$", mdMeMaterialbase.getMaterial_name().substring(mdMeMaterialbase.getMaterial_name().length() - 1))
-                                    ).findFirst();
-                                    if (!first.isPresent()) {
-                                        errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
-                                    }
-                                    workorder.setMaterial_id(first.get().getMaterial_id());
+            for (int i = 0; i < read.size(); i++) {
+                Map<String,String> errorMap = new HashMap();
+                List<Object> list = read.get(i);
+                if (ObjectUtil.isEmpty(list)) {continue;}
+                PdmProduceWorkorder workorder = new PdmProduceWorkorder();
+                packageForm(workorder);
+                for (int j = 0; j < list.size(); j++) {
+                    String col = String.valueOf(list.get(j));
+                    解析cell:{ //如果是第一行 为生产日期
+                        if (i == 0 && j == 0) {
+                            continue row;
+                        }
+                        //如果第一列包含规格二字 则为表头 结束内循环列
+                        if (j == 0 && col.contains("班次")) {
+                            continue row;
+                        }
+                        if (j == 0) {
+                            //物料
+                            workorder.setShift_type_scode(col.equals("晚班") ? "2" : "1");
+                        }
+                        if (j == 1) {
+                            //物料
+                            workorder.setPlanproduceend_date(col.substring(0,col.indexOf(" "))+" 18:30:00");
+                            workorder.setPlanproducestart_date(col.substring(0,col.indexOf(" "))+" 07:30:00");
+                        }
+                        if (j == 2) {
+                            //物料
+                            List<MdMeMaterialbase> material_specs = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().eq("material_spec", col));
+                            if (CollectionUtils.isEmpty(material_specs)) {
+                                errorMap.put("第" + j + "行", col+"物料规格对应物料信息不存在");
+                            } else {
+                                Optional<MdMeMaterialbase> first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S")
+                                        && Pattern.matches("^[0-9]*$", mdMeMaterialbase.getMaterial_name().substring(mdMeMaterialbase.getMaterial_name().length() - 1))
+                                ).findFirst();
+                                if (!first.isPresent()) {
+                                    errorMap.put("第" + j + "行", col+"物料规格对应物料信息不存在");
                                 }
-                            }
-                            if (j == 3) {
-                                PdmBiWorkprocedure workprocedure = workprocedureService.getOne(new QueryWrapper<PdmBiWorkprocedure>().eq("workprocedure_name", col));
-                                if (ObjectUtil.isEmpty(workprocedure)) {
-                                    errorMap.put("第" + i + "行" + col, "工序名称是否正确");
-                                } else {
-                                    workorder.setWorkprocedure_id(workprocedure.getWorkprocedure_id());
-                                }
-                            }
-                            if (j == 4) {
-                                //设备 A1_TW_
-                                workorder.setDevice_code("A1_TW_" + col);
-                            }
-                            if (j == 7) {
-                                //单重
-                                BigDecimal bigDecimal = BigDecimal.valueOf(Double.valueOf(col) * 1000);
-                                workorder.setMaterial_weight(bigDecimal.setScale(3, RoundingMode.HALF_UP));
-                            }
-                            if (j == 8) {
-                                //操作工
-                                SysUser user = userService.getOne(new QueryWrapper<SysUser>().eq("person_name", col));
-                                if (ObjectUtil.isEmpty(user)) {
-                                    errorMap.put("第" + i + "行" + col, " 操作工没有账号");
-                                } else {
-                                    workorder.setCurrent_produce_person_id(user.getUser_id());
-                                }
-                            }
-                            if (j == 9) {
-                                workorder.setPlan_qty(new BigDecimal(Long.valueOf(col)));
+                                workorder.setMaterial_id(first.get().getMaterial_id());
                             }
                         }
-                    }
-                    if (CollectionUtils.isEmpty(errorMap)){
-                        data.add(workorder);
-                    }else {
-                        throw new BadRequestException(JSON.toJSONString(errorMap));
+                        if (j == 3) {
+                            PdmBiWorkprocedure workprocedure = workprocedureService.getOne(new QueryWrapper<PdmBiWorkprocedure>().eq("workprocedure_name", col));
+                            if (ObjectUtil.isEmpty(workprocedure)) {
+                                errorMap.put("第" + j + "行", col+"工序名称是否正确");
+                            } else {
+                                workorder.setWorkprocedure_id(workprocedure.getWorkprocedure_id());
+                            }
+                        }
+                        if (j == 4) {
+                            //设备 A1_TW_
+                            workorder.setDevice_code("A1_TW_" + col.replaceAll("-", "_"));
+                        }
+                        if (j == 7) {
+                            //单重
+                            BigDecimal bigDecimal = BigDecimal.valueOf(Double.valueOf(col) * 1000);
+                            workorder.setMaterial_weight(bigDecimal.setScale(3, RoundingMode.HALF_UP));
+                        }
+                        if (j == 8) {
+                            //操作工
+                            SysUser user = userService.getOne(new QueryWrapper<SysUser>().eq("person_name", col));
+                            if (ObjectUtil.isEmpty(user)) {
+                                errorMap.put("第" + j + "行",  col+" 操作工没有账号");
+                            } else {
+                                workorder.setCurrent_produce_person_id(user.getUser_id());
+                            }
+                        }
+                        if (j == 9) {
+                            workorder.setPlan_qty(new BigDecimal(Long.valueOf(col)));
+                        }
                     }
                 }
-            this.saveBatch(data);
-
+                if (CollectionUtils.isEmpty(errorMap)){
+                    data.add(workorder);
+                }else { errlist.add(errorMap); };
+            }
+            if (!CollectionUtils.isEmpty(errlist)){
+               throw new BadRequestException(JSON.toJSONString(errlist));
+            }else {
+                this.saveBatch(data);
+            }
         } catch (Exception e) {
             e.printStackTrace();
             throw new BadRequestException(e.getMessage());
@@ -364,6 +346,18 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
 
     }
 
+    private void packageForm(PdmProduceWorkorder workorder) {
+        workorder.setWorkorder_id(IdUtil.getStringId());
+        workorder.setWorkorder_code(CodeUtil.getNewCode("PDM_SHIFTORDER"));
+        workorder.setWorkorder_status(WorkerOrderEnum.CREATE.getCode());
+        workorder.setIs_needmove(true);
+        workorder.setIs_canupdate_update(true);
+        workorder.setCreate_time(DateUtil.now());
+        workorder.setCreate_id(SecurityUtils.getCurrentUserId());
+        workorder.setCreate_name("导入订单");
+        workorder.setCreate_type(StatusEnum.EXCELINTO.getCode());
+    }
+
 
     @Override
     @Transactional
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java
index 0450d061..a0aa8f51 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java
@@ -3,12 +3,19 @@ package org.nl.wms.scheduler_manage.controller.task;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.enums.StatusEnum;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
+import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
 import org.nl.wms.system_manage.service.dict.ISysDictService;
 import org.nl.wms.system_manage.service.dict.dao.Dict;
 import org.nl.wms.product_manage.sch.manage.FinishTypeEnum;
@@ -21,6 +28,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 /**
  * @author ldjun
@@ -42,8 +50,22 @@ public class TaskController {
     @Log("查询任务")
     @ApiOperation("查询任务")
     //@PreAuthorize("@el.check('task:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
-        return new ResponseEntity<>(taskService.queryAll(whereJson, page), HttpStatus.OK);
+    public ResponseEntity<Object> query(@RequestParam Map query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize());
+        page.setOrderBy("task_code desc");
+        List<Map> list = baseTaskService.queryAll(query);
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(page.getTotal());
+        return new ResponseEntity<>(build, HttpStatus.OK);
+    }
+
+
+    @GetMapping("/undo")
+    @Log("查询任务")
+    @ApiOperation("查询任务")
+    public ResponseEntity<Object> undo() {
+        int count = baseTaskService.count(new QueryWrapper<SchBaseTask>().lt("task_status", StatusEnum.TASK_FINISH.getCode()));
+        return new ResponseEntity<>(count, HttpStatus.OK);
     }
 
     @PostMapping
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/ISchBaseTaskService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/ISchBaseTaskService.java
index df6f158b..7ac39cac 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/ISchBaseTaskService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/ISchBaseTaskService.java
@@ -3,6 +3,7 @@ package org.nl.wms.scheduler_manage.service.task;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -21,4 +22,6 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
      * @param param
      */
     void operation(Map<String, Object> param);
+
+    List<Map> queryAll(Map query);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/SchBaseTaskMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/SchBaseTaskMapper.java
index b7630924..268641d6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/SchBaseTaskMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/SchBaseTaskMapper.java
@@ -17,5 +17,7 @@ import java.util.Map;
  */
 public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
 
-    List<Map> getTaskInfo (@Param("map") Map map);
+    List<Map> getTaskInfo (Map map);
+
+    List<Map> queryAll (Map map);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/xml/SchBaseTaskMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/xml/SchBaseTaskMapper.xml
index 68475c66..f8933dd0 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/xml/SchBaseTaskMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/xml/SchBaseTaskMapper.xml
@@ -21,7 +21,6 @@
         LEFT JOIN sch_base_point point1 ON task.point_code1 = point1.point_code
         LEFT JOIN sch_base_point point2 ON task.point_code2 = point2.point_code
         LEFT JOIN md_me_materialbase mater ON task.material_id = mater.material_id
-        LEFT JOIN md_pb_classstandard class ON task.task_type = class.class_id
         LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
         <where>
             task.is_delete = '0'
@@ -31,4 +30,64 @@
         </where>
 
     </select>
+    <select id="queryAll" resultType="java.util.Map">
+        SELECT
+        task.*,
+        mb.material_name,
+        mb.material_spec,
+        mb.material_code,
+        DICT.label task_status_name,
+        reg1.region_name as point1_region_name,
+        reg2.region_name as point2_region_name,
+        reg3.region_name as point3_region_name,
+        reg4.region_name as point4_region_name
+        FROM
+        sch_base_task task
+        left join md_me_materialbase mb on mb.material_id = task.material_id
+        LEFT JOIN SYS_DICT DICT ON DICT.`VALUE` = TASK.TASK_STATUS AND DICT.`CODE` = 'TASK_STATUS'
+        LEFT JOIN SCH_BASE_Region reg1 ON reg1.region_code = (
+        SELECT p1.region_code FROM SCH_BASE_Point p1 WHERE p1.point_code = task.point_code1
+        )
+        LEFT JOIN SCH_BASE_Region reg2 ON reg2.region_code = (
+        SELECT p2.region_code FROM SCH_BASE_Point p2 WHERE p2.point_code = task.point_code2
+        )
+        LEFT JOIN SCH_BASE_Region reg3 ON reg3.region_code = (
+        SELECT p3.region_code FROM SCH_BASE_Point p3 WHERE p3.point_code = task.point_code3
+        )
+        LEFT JOIN SCH_BASE_Region reg4 ON reg4.region_code = (
+        SELECT p4.region_code FROM SCH_BASE_Point p4 WHERE p4.point_code = task.point_code4
+        )
+        WHERE
+        task.is_delete = '0'
+        <if test="task_type != null and task_type != ''">
+           and task.task_type = #{task_type}
+        </if>
+        <if test="finished_type != null and finished_type != ''">
+           and task.finished_type = #{finished_type}
+        </if>
+        <if test="task_status != null and task_status != ''">
+           and task.task_status in (${task_status})
+        </if>
+        <if test="begin_time != null and begin_time != ''">
+           and task.create_time >= #{begin_time}
+        </if>
+        <if test="end_time != null and end_time != ''">
+           and #{end_time}  >= task.create_time
+        </if>
+        <if test="product_area != null and product_area != ''">
+           and task.product_area = #{product_area}
+        </if>
+        <if test="point_code != null and point_code != ''">
+           and ( task.point_code1 = #{point_code} or task.point_code2 =  #{point_code} )
+        </if>
+        <if test="vehicle_code != null and vehicle_code != ''">
+           and task.vehicle_code = #{vehicle_code}
+        </if>
+        <if test="task_code != null and task_code != ''">
+           and task.task_code = #{task_code}
+        </if>
+        <if test="task_id != null and task_code != ''">
+           and task.task_id = #{task_id}
+        </if>
+    </select>
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/TaskQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/TaskQuery.java
new file mode 100644
index 00000000..8530eb67
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/TaskQuery.java
@@ -0,0 +1,12 @@
+package org.nl.wms.scheduler_manage.service.task.dto;
+
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
+
+/*
+ * @author ZZQ
+ * @Date 2023/6/9 15:49
+ */
+public class TaskQuery extends BaseQuery<SchBaseTask> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java
index 0147ca52..91f30a18 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java
@@ -6,12 +6,15 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.common.enums.StatusEnum;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
 import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl;
+import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
 import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
 import org.nl.wms.scheduler_manage.service.task.dao.mapper.SchBaseTaskMapper;
@@ -22,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -39,19 +44,40 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
     @Lazy
     private AcsToWmsService acsToWmsService;
 
+    @Override
+    public List<Map> queryAll(Map query) {
+        if (query.get("task_status") != null && ((String)query.get("task_status")).contains("-1")){
+            query.put("task_status",((String)query.get("task_status")).replaceAll("-1","1,4,5"));
+        }
+        List<Map> maps = this.baseMapper.queryAll(query);
+        return maps;
+    }
+
     @Override
     public void operation(Map<String, Object> map) {
         WmsToAcsServiceImpl wms = new WmsToAcsServiceImpl();
         String task_id = MapUtil.getStr(map, "task_id");
         String method_name = MapUtil.getStr(map, "method_name");
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
-        if (taskObj.getString("task_status").equals(TaskStatusEnum.FINISHED.getCode())) throw new BadRequestException("任务已完成!");
-
+        SchBaseTask taskObj = this.getOne(new QueryWrapper<SchBaseTask>().eq("task_id", task_id));
+        if (taskObj.getTask_status().equals(TaskStatusEnum.FINISHED.getCode())) {
+            throw new BadRequestException("任务已完成!不允许下发");
+        }
         switch (method_name) { // forceFinish, cancel
             case "immediateNotifyAcs":
-                JSONArray array = new JSONArray();
-                array.add(taskObj);
-                wms.issueTaskToAcs(array);
+                if (!taskObj.getTask_status().equals(TaskStatusEnum.START_AND_POINT.getCode())){
+                    try {
+                        AbstractAcsTask taskHandler = (AbstractAcsTask) SpringContextHolder.getBean(Class.forName(taskObj.getHandle_class()));
+                        taskHandler.pointConfirm((JSONObject) JSONObject.toJSON(taskObj));
+                        JSONArray array = new JSONArray();
+                        array.add(taskObj);
+                        wms.issueTaskToAcs(array);
+                    }catch (Exception ex){
+                        taskObj.setTask_status(StatusEnum.TASK_START_ERROR.getCode());
+                        taskObj.setRemark(ex.getMessage());
+                        taskObj.setUpdate_time(new Date());
+                        this.updateById(taskObj);
+                    }
+                }
                 break;
             case "forceFinish":
                 JSONArray finish = new JSONArray();
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml
index 29361ef8..cdab71b2 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml
@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev3
+    active: prod
   jackson:
     time-zone: GMT+8
   data:
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 eec68927..69a2965c 100644
--- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue
+++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue
@@ -127,19 +127,20 @@
               />
             </el-select>
           </el-form-item>
-
           <rrOperation />
-          <el-form-item label="未完结任务数">
-          <el-input
-            v-model="undo"
-            clearable
-            style="width: 180px"
-          />
-          </el-form-item>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <span>
+        未完成数：
+        <el-input
+          v-model="undo"
+          clearable
+          style="width: 60px"
+        />
       <el-button type="primary" @click="taskScheduler()">任务调度</el-button>
+      </span>
+
       <crudOperation :permission="permission" />
       <!--表格渲染-->
       <el-table
@@ -240,7 +241,6 @@ import pagination from '@crud/Pagination'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
-import { scheduler } from './task'
 
 export default {
   name: 'Task',
@@ -306,6 +306,9 @@ export default {
     crudTask.getTaskType().then(res => {
       this.taskTypeList = res
     })
+    crudTask.undo().then(res => {
+      this.undo = res
+    })
     crudTask.getAcsTaskType().then(res => {
       this.acsTaskTypeList = res
     })
diff --git a/mes/qd/src/views/wms/scheduler_manage/task/task.js b/mes/qd/src/views/wms/scheduler_manage/task/task.js
index 4b534246..b6623abd 100644
--- a/mes/qd/src/views/wms/scheduler_manage/task/task.js
+++ b/mes/qd/src/views/wms/scheduler_manage/task/task.js
@@ -43,6 +43,12 @@ export function getAcsTaskType() {
     method: 'get'
   })
 }
+export function undo() {
+  return request({
+    url: 'api/task//undo',
+    method: 'get'
+  })
+}
 
 export function getFinishType() {
   return request({
@@ -74,5 +80,6 @@ export default {
   getTaskType,
   getAcsTaskType,
   getFinishType,
-  scheduler
+  scheduler,
+  undo
 }

From 628cf17dffc158a0e1c2dc861fae6d16020fe4c6 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 12 Jun 2023 14:58:52 +0800
Subject: [PATCH 17/19] =?UTF-8?q?rev=EF=BC=9A=E6=88=90=E5=93=81=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IStivtlostorivnCpInController.java        |  24 ++
 .../IStivtlostorivnCpOutController.java       |  24 ++
 .../IStIvtIostorinvCpOutService.java          |  27 ++
 .../iostorInv/IStIvtIostorinvCpService.java   |  26 ++
 .../impl/StIvtIostorinvCpOutServiceImpl.java  |  50 ++++
 .../impl/StIvtIostorinvCpServiceImpl.java     |  50 ++++
 .../product/productIn/TaskDialog.vue          | 268 +++++------------
 .../product/productIn/index.vue               |  43 ++-
 .../product/productIn/productin.js            |  29 +-
 .../product/productOut/TaskDialog.vue         | 281 ++++++++++++++++++
 .../product/productOut/index.vue              |  29 +-
 .../product/productOut/productout.js          |  29 +-
 12 files changed, 676 insertions(+), 204 deletions(-)
 create mode 100644 mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java
index 4cec9f98..4dfa0b09 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java
@@ -130,4 +130,28 @@ public class IStivtlostorivnCpInController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/delTask")
+    @Log("删除任务")
+    @ApiOperation("删除任务")
+    public ResponseEntity<Object> delTask(@RequestBody JSONObject whereJson){
+        iStIvtIostorinvCpService.delTask(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/sendTask")
+    @Log("下发任务")
+    @ApiOperation("下发任务")
+    public ResponseEntity<Object> sendTask(@RequestBody JSONObject whereJson){
+        iStIvtIostorinvCpService.sendTask(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/confirmTask")
+    @Log("标识完成任务")
+    @ApiOperation("标识完成任务")
+    public ResponseEntity<Object> confirmTask(@RequestBody JSONObject whereJson){
+        iStIvtIostorinvCpService.confirmTask(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
index 13f6779b..ca102274 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
@@ -117,5 +117,29 @@ public class IStivtlostorivnCpOutController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/delTask")
+    @Log("删除任务")
+    @ApiOperation("删除任务")
+    public ResponseEntity<Object> delTask(@RequestBody JSONObject whereJson){
+        iStIvtIostorinvCpOutService.delTask(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/sendTask")
+    @Log("下发任务")
+    @ApiOperation("下发任务")
+    public ResponseEntity<Object> sendTask(@RequestBody JSONObject whereJson){
+        iStIvtIostorinvCpOutService.sendTask(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/confirmTask")
+    @Log("标识完成任务")
+    @ApiOperation("标识完成任务")
+    public ResponseEntity<Object> confirmTask(@RequestBody JSONObject whereJson){
+        iStIvtIostorinvCpOutService.confirmTask(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
 
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
index 7af2d9d3..930ba2cc 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
@@ -151,4 +151,31 @@ public interface IStIvtIostorinvCpOutService extends IService<StIvtIostorinvCp>
      * }
      */
     void taskOperate(JSONObject whereJson);
+
+    /**
+     * 删除任务
+     * @param whereJson
+     * {
+     *     iostorinvdis_id ： 分配明细标识
+     * }
+     */
+    void delTask(JSONObject whereJson);
+
+    /**
+     * 下发任务
+     * @param whereJson
+     * {
+     *     task_id ： 任务标识
+     * }
+     */
+    void sendTask(JSONObject whereJson);
+
+    /**
+     * 标识完成任务
+     * @param whereJson
+     * {
+     *     task_id ： 任务标识
+     * }
+     */
+    void confirmTask(JSONObject whereJson);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java
index 49883fed..f9389824 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java
@@ -163,4 +163,30 @@ public interface IStIvtIostorinvCpService extends IService<StIvtIostorinvCp> {
      */
     void taskOperate(JSONObject whereJson);
 
+    /**
+     * 删除任务
+     * @param whereJson
+     * {
+     *     iostorinvdis_id ： 分配明细标识
+     * }
+     */
+    void delTask(JSONObject whereJson);
+
+    /**
+     * 下发任务
+     * @param whereJson
+     * {
+     *     task_id ： 任务标识
+     * }
+     */
+    void sendTask(JSONObject whereJson);
+
+    /**
+     * 标识完成任务
+     * @param whereJson
+     * {
+     *     task_id ： 任务标识
+     * }
+     */
+    void confirmTask(JSONObject whereJson);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
index 940beca1..961e8cf8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +22,8 @@ import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
+import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.masterdata_manage.MasterEnum;
 import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService;
 import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService;
@@ -584,6 +588,52 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delTask(JSONObject whereJson) {
+        StIvtIostorinvdisCp disDao = iostorinvdisCpService.getById(whereJson.getString("iostorinvdis_id"));
+
+        // 1.删除任务
+        iSchBaseTaskService.update(
+                new UpdateWrapper<SchBaseTask>().lambda()
+                        .set(SchBaseTask::getTask_status,TaskStatusEnum.CANCEL.getCode())
+                        .eq(SchBaseTask::getTask_id, disDao.getTask_id())
+        );
+
+        // 2.更新分配
+        disDao.setTask_id("");
+        disDao.setPoint_code("");
+        disDao.setPoint_id("");
+        disDao.setPoint_name("");
+        disDao.setWork_status(IOSEnum.WORK_STATUS.code("未生成"));
+        iostorinvdisCpService.updateById(disDao);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void sendTask(JSONObject whereJson) {
+
+        SchBaseTask taskDao = iSchBaseTaskService.getById(whereJson.getString("task_id"));
+        JSONArray paramArr = new JSONArray();
+        paramArr.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao)));
+
+        // 1.下发任务
+        WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
+        bean.issueTaskToAcs2(paramArr);
+
+        // 2.更新任务状态
+        taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode());
+        iSchBaseTaskService.updateById(taskDao);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void confirmTask(JSONObject whereJson) {
+        whereJson.put("status", AcsTaskEnum.STATUS_FINISH.getCode());
+        taskOperate(whereJson);
+    }
+
     @NotNull
     private StIvtIostorinvCp packageMstForm(StIvtIostorinvCp stIvtIostorinvCp,JSONObject whereJson,Boolean isUpdate) {
         JSONArray rows = whereJson.getJSONArray("tableData");
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
index 22b201c8..4ca30240 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,10 +19,13 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.publish.event.PointEvent;
+import org.nl.common.utils.AcsUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
+import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.masterdata_manage.MasterEnum;
 import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService;
 import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService;
@@ -707,6 +712,51 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delTask(JSONObject whereJson) {
+        StIvtIostorinvdisCp disDao = iostorinvdisCpService.getById(whereJson.getString("iostorinvdis_id"));
+
+        // 1.删除任务
+        iSchBaseTaskService.update(
+                new UpdateWrapper<SchBaseTask>().lambda()
+                    .set(SchBaseTask::getTask_status,TaskStatusEnum.CANCEL.getCode())
+                    .eq(SchBaseTask::getTask_id, disDao.getTask_id())
+        );
+
+        // 2.更新分配
+        disDao.setTask_id("");
+        disDao.setPoint_code("");
+        disDao.setPoint_id("");
+        disDao.setPoint_name("");
+        disDao.setWork_status(IOSEnum.WORK_STATUS.code("未生成"));
+        iostorinvdisCpService.updateById(disDao);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void sendTask(JSONObject whereJson) {
+        SchBaseTask taskDao = iSchBaseTaskService.getById(whereJson.getString("task_id"));
+        JSONArray paramArr = new JSONArray();
+        paramArr.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao)));
+
+        // 1.下发任务
+        WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
+        bean.issueTaskToAcs2(paramArr);
+
+        // 2.更新任务状态
+        taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode());
+        iSchBaseTaskService.updateById(taskDao);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void confirmTask(JSONObject whereJson) {
+        whereJson.put("status", AcsTaskEnum.STATUS_FINISH.getCode());
+        taskOperate(whereJson);
+    }
+
     @NotNull
     private StIvtIostorinvCp packageMstForm(StIvtIostorinvCp stIvtIostorinvCp,JSONObject whereJson,Boolean isUpdate) {
         JSONArray rows = whereJson.getJSONArray("tableData");
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue
index 8f49a3ed..bbee711c 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue
@@ -35,51 +35,34 @@
         @row-click="clcikRow"
       >
         <el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
-        <el-table-column show-overflow-tooltip prop="bill_code" label="单据号" align="center" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
-        <el-table-column show-overflow-tooltip prop="sap_pcsn" label="SAP批次" align="center" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="批次" align="center" />
         <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column
-          show-overflow-tooltip
-          prop="assign_qty"
-          :formatter="crud.formatNum3"
-          label="已分配数量"
-          align="center"
-        />
+        <el-table-column show-overflow-tooltip prop="assign_qty" :formatter="crud.formatNum3" label="已分配数量" align="center" />
         <el-table-column show-overflow-tooltip prop="unassign_qty" :formatter="crud.formatNum3" label="未分配数量" align="center" />
         <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" align="center" />
       </el-table>
     </el-card>
-    <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
+<!--    <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini">
         <el-form-item prop="checked">
           <el-checkbox v-model="form.checked" true-label="1" false-label="0" @change="checkedChange()">仅显示未完成的任务</el-checkbox>
         </el-form-item>
       </el-form>
-    </el-card>
+    </el-card>-->
     <div class="crud-opts2">
       <span class="role-span">入库单据任务项</span>
       <span class="crud-opts-right2">
         <!--左侧插槽-->
         <slot name="left" />
-    <!--    <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="updateTask()"
-        >
-          修改
-        </el-button>-->
         <el-button
           slot="left"
           class="filter-item"
           type="primary"
           icon="el-icon-plus"
           size="mini"
+          :disabled="dis_del"
           @click="delTask()"
         >
           删除
@@ -90,7 +73,8 @@
           type="warning"
           icon="el-icon-check"
           size="mini"
-          @click="reIssueTask()"
+          :disabled="dis_send"
+          @click="sendTask()"
         >
           下发
         </el-button>
@@ -100,20 +84,11 @@
           type="warning"
           icon="el-icon-check"
           size="mini"
+          :disabled="dis_confirm"
           @click="confirmTask()"
         >
           标识完成
         </el-button>
-        <!--    <el-button
-          slot="left"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-check"
-          size="mini"
-          @click="cancelTask()"
-        >
-          取消完成
-        </el-button>-->
       </span>
     </div>
     <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
@@ -130,33 +105,30 @@
         @row-click="clcikDisRow"
       >
         <el-table-column width="60" prop="seq_no" label="序号" align="center" />
-        <el-table-column width="150" prop="material_code" label="物料编码" align="center" />
-        <el-table-column width="150" prop="material_name" label="物料名称" align="center" />
-        <el-table-column width="170" prop="pcsn" label="子卷号" align="center" />
-        <el-table-column width="120" prop="sap_pcsn" label="SAP批次" align="center" />
-        <el-table-column width="230" prop="box_no" label="木箱码" align="center" />
+        <el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" align="center" />
+        <el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" align="center" />
+        <el-table-column show-overflow-tooltip width="170" prop="pcsn" label="批次" align="center" />
         <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column show-overflow-tooltip prop="struct_code" label="分配货位" align="center" />
-        <el-table-column show-overflow-tooltip prop="work_status" label="指令状态" :formatter="statusFormat" align="center" />
-        <el-table-column show-overflow-tooltip prop="task_code" label="指令操作号" align="center" />
-        <el-table-column show-overflow-tooltip prop="point_code" label="入库点位编码" align="center" />
-        <el-table-column show-overflow-tooltip prop="point_name" label="入库点位名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="point_code1" label="起始位置" align="center" />
+        <el-table-column show-overflow-tooltip prop="point_code2" label="目的位置" align="center" />
+        <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
+        <el-table-column show-overflow-tooltip prop="task_status" label="任务状态" align="center" :formatter="formatStatus"/>
+        <el-table-column show-overflow-tooltip prop="task_type" label="任务类型" align="center" width="150px" :formatter="formatType"/>
       </el-table>
     </el-card>
 
-    <StructUpdateDiv :dialog-show.sync="structShow" :sect-prop="sectProp" :bucket-form="bucketForm" @updateCommit="updateCommit" />
-
   </el-dialog>
 </template>
 
 <script>
 import CRUD, { crud } from '@crud/crud'
+import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 
 export default {
   name: 'TaskDialog',
-  components: { StructUpdateDiv },
+  components: {},
   mixins: [crud()],
-  dicts: ['io_bill_status', 'task_status'],
+  dicts: ['SCH_TASK_TYPE_DTL', 'task_status'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -173,23 +145,16 @@ export default {
   data() {
     return {
       dialogVisible2: false,
-      tableDtl: [],
-      stor_id: '',
-      sect_id: '',
-      sectProp: null,
-      structShow: false,
-      sects: [],
       dis_row: null,
+      dis_del: true,
+      dis_send: true,
+      dis_confirm: true,
       fullscreenLoading: false,
-      bucketParam: null,
-      bucketForm: null,
-      bucketDtlShow: false,
       form: {
         tableMater: [],
         dtl_row: null,
         checked: '1'
       },
-      storlist: [],
       rules: {
       }
     }
@@ -209,154 +174,81 @@ export default {
       this.form.dtl_row = null
       this.$emit('AddChanged')
     },
+    clcikRow(row) {
+      this.form.dtl_row = row
+      this.queryTableDdis()
+    },
+    clcikDisRow(row) {
+      debugger
+      this.dis_row = row
+      if (this.dis_row.task_status < 5) {
+        this.dis_del = false
+        this.dis_send = false
+      } else {
+        this.dis_del = true
+        this.dis_send = true
+      }
+      if (this.dis_row.task_status < 7) {
+        this.dis_confirm = false
+      } else {
+        this.dis_confirm = true
+      }
+    },
     delTask() {
-      if (!this.dis_row) {
-        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.dis_row.work_status !== '04') {
-        this.crud.notify('只能对状态为生成的任务进行删除！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
       this.fullscreenLoading = true
-      crudRawAssist.delTask(this.dis_row).then(res => {
+      crudProductIn.delTask({ 'iostorinvdis_id': this.dis_row.iostorinvdis_id }).then(res => {
+        this.crud.notify('删除成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.fullscreenLoading = false
-        crudRawAssist.queryTask(this.form.dtl_row).then(res => {
-          this.form.tableMater = res
-        }).catch(() => {
-          this.fullscreenLoading = false
-        })
-        crudRawAssist.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '2' }).then(res => {
-          this.openParam = res
-          this.dis_row = null
-          this.crud.notify('删除任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          this.fullscreenLoading = false
-        })
+        this.queryTableDdis()
+        this.initFlag()
       }).catch(() => {
         this.fullscreenLoading = false
       })
     },
-    statusFormat(row, column) {
-      return this.dict.label.task_status[row.work_status]
+    sendTask() {
+      this.fullscreenLoading = true
+      crudProductIn.sendTask({ 'task_id': this.dis_row.task_id }).then(res => {
+        this.crud.notify('下发成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.fullscreenLoading = false
+        this.queryTableDdis()
+        this.initFlag()
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
     },
     confirmTask() {
-      if (!this.dis_row) {
-        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.dis_row.work_status === '99' || this.dis_row.work_status === '00') {
-        this.crud.notify('只能已生成或下发进行中的任务完成！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
       this.fullscreenLoading = true
-      crudRawAssist.confirmTask(this.dis_row).then(res => {
-        crudRawAssist.queryTask(this.form.dtl_row).then(res2 => {
-          this.form.tableMater = res2
-          this.fullscreenLoading = false
-          this.crud.notify('强制确认任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          this.fullscreenLoading = false
-        })
+      crudProductIn.confirmTask({ 'task_id': this.dis_row.task_id }).then(res => {
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.fullscreenLoading = false
+        this.queryTableDdis()
+        this.initFlag()
       }).catch(() => {
         this.fullscreenLoading = false
       })
     },
-    cancelTask() {
-      if (!this.dis_row) {
-        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.dis_row.work_status !== '99') {
-        this.crud.notify('只能对状态为完成的任务进行取消！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.fullscreenLoading = true
-      crudRawAssist.cancelTask(this.dis_row).then(res => {
-        this.fullscreenLoading = false
-        crudRawAssist.queryTask(this.form.dtl_row).then(res2 => {
-          this.form.tableMater = res2
-          this.crud.notify('取消确认任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          this.fullscreenLoading = false
-        })
-      }).catch(() => {
-        this.fullscreenLoading = false
-      })
-    },
-    reIssueTask() {
-      if (!this.dis_row) {
-        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.dis_row.work_status !== '04') {
-        this.crud.notify('只能对状态为生成的任务进行下发！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.fullscreenLoading = true
-      crudRawAssist.reIssueTask(this.dis_row).then(res => {
-        this.fullscreenLoading = false
-        crudRawAssist.queryTask(this.form.dtl_row).then(res2 => {
-          this.form.tableMater = res2
-          this.crud.notify('下发任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        })
-      }).catch(() => {
-        this.fullscreenLoading = false
-      })
-      crudRawAssist.queryTask(this.form.dtl_row).then(res => {
-        this.form.tableMater = res
-      })
-    },
-    updateTask() {
-      if (!this.dis_row) {
-        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      debugger
-      if (this.dis_row.work_status !== '01') {
-        this.crud.notify('只能对状态为生成的任务进行修改！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.structShow = true
-      this.bucketForm = this.dis_row
-    },
-    updateCommit() {
-      crudRawAssist.queryTask(this.form.dtl_row).then(res => {
-        this.form.tableMater = res
-        this.crud.notify('修改任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      })
-    },
-    checkedChange(val) {
-      this.form.dtl_row.checked = this.form.checked
-      crudRawAssist.queryTask(this.form.dtl_row).then(res => {
-        this.form.tableMater = res
-      })
-    },
-    clcikRow(row, column, event) {
-      this.form.dtl_row = row
-      row.checked = this.form.checked
-      crudRawAssist.queryTask(row).then(res => {
-        this.form.tableMater = res
-      })
-    },
-    clcikDisRow(row, column, event) {
-      this.dis_row = row
-    },
-    assignFormat(row, column) {
-      if (!row.assign_qty) {
-        return '0'
-      } else {
-        return row.assign_qty
-      }
-    },
     tableRowClassName({ row, rowIndex }) {
       row.index = rowIndex
     },
-    bucketDtl(row) {
-      crudRawAssist.bucketDtl(row).then(res => {
-        this.bucketParam = res
-        this.bucketDtlShow = true
-      })
+    queryTableDdis() {
+      if (this.form.dtl_row !== null) {
+        crudProductIn.getIosInvDis({ 'iostorinvdtl_id': this.form.dtl_row.iostorinvdtl_id }).then(res => {
+          this.form.tableMater = res
+        }).catch(() => {
+          this.form.tableMater = []
+        })
+      }
+    },
+    formatStatus(row) {
+      return this.dict.label.task_status[row.task_status]
+    },
+    formatType(row) {
+      return this.dict.label.SCH_TASK_TYPE_DTL[row.task_type]
+    },
+    initFlag() {
+      this.dis_del = true
+      this.dis_send = true
+      this.dis_confirm = true
     }
   }
 }
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
index b77531c1..5cb12bf9 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
@@ -141,17 +141,17 @@
         >
           分配
         </el-button>
-        <!--     <el-button
-               slot="right"
-               class="filter-item"
-               type="success"
-               :disabled="dis_flag"
-               icon="el-icon-position"
-               size="mini"
-               @click="divOpen"
-             >
-               作业任务
-             </el-button>-->
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="task_flag"
+          @click="taskOpen"
+        >
+          作业任务
+        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -220,6 +220,7 @@
     <AddDialog @AddChanged="querytable" />
     <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
     <DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" @AddChanged="querytable" />
+    <TaskDialog :dialog-show.sync="taskShow" :open-param="taskOpenParam" />
   </div>
 </template>
 
@@ -237,10 +238,11 @@ import DivDialog from '@/views/wms/storage_manage/product/productIn/DivDialog'
 import ViewDialog from '@/views/wms/storage_manage/product/productIn/ViewDialog'
 import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
 import { mapGetters } from 'vuex'
+import TaskDialog from '@/views/wms/storage_manage/product/productIn/TaskDialog'
 
 export default {
   name: 'ProductIn',
-  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog },
+  components: { TaskDialog, ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog },
   cruds() {
     return CRUD({
       title: '',
@@ -258,15 +260,18 @@ export default {
       height: document.documentElement.clientHeight - 180 + 'px;',
       permission: {},
       dis_flag: true,
+      task_flag: true,
       confirm_flag: true,
       disShow: false,
       viewShow: false,
       mstrow: {},
       divShow: false,
       openParam: [],
+      taskOpenParam: [],
       currentRow: null,
       storlist: [],
-      storId: null
+      storId: null,
+      taskShow: false
     }
   },
   computed: {
@@ -320,12 +325,18 @@ export default {
         } else {
           this.confirm_flag = true
         }
+        if (currentRow.bill_status !== '99') {
+          this.task_flag = false
+        } else {
+          this.task_flag = true
+        }
       }
     },
     handleCurrentChange(currentRow) {
       if (currentRow === null) {
         this.dis_flag = true
         this.confirm_flag = true
+        this.task_flag = true
         this.currentRow = {}
       }
     },
@@ -357,6 +368,12 @@ export default {
         this.divShow = true
       })
     },
+    taskOpen() {
+      crudProductIn.getIosInvDtl({ 'bill_code': this.currentRow.bill_code }).then(res => {
+        this.taskOpenParam = res
+      })
+      this.taskShow = true
+    },
     querytable() {
       this.onSelectAll()
       this.crud.toQuery()
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/productin.js b/mes/qd/src/views/wms/storage_manage/product/productIn/productin.js
index e8674222..63fa1658 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/productin.js
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/productin.js
@@ -104,6 +104,30 @@ export function cancelConfirmvehicle(data) {
   })
 }
 
+export function delTask(data) {
+  return request({
+    url: '/api/productIn/delTask',
+    method: 'post',
+    data
+  })
+}
+
+export function sendTask(data) {
+  return request({
+    url: '/api/productIn/sendTask',
+    method: 'post',
+    data
+  })
+}
+
+export function confirmTask(data) {
+  return request({
+    url: '/api/productIn/confirmTask',
+    method: 'post',
+    data
+  })
+}
+
 export default {
   add,
   edit,
@@ -117,5 +141,8 @@ export default {
   unDivStruct,
   setPoint,
   confirm,
-  cancelConfirmvehicle
+  cancelConfirmvehicle,
+  delTask,
+  sendTask,
+  confirmTask
 }
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue
new file mode 100644
index 00000000..9b6c0f65
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    v-loading.fullscreen.lock="fullscreenLoading"
+    append-to-body
+    :visible.sync="dialogVisible2"
+    destroy-on-close
+    :show-close="false"
+    fullscreen
+    @close="close"
+  >
+
+    <span slot="title" class="dialog-footer">
+      <div class="crud-opts2">
+        <span class="el-dialog__title2">入库单任务操作</span>
+        <span class="crud-opts-right2">
+          <!--左侧插槽-->
+          <slot name="left" />
+          <el-button slot="left" type="info" @click="dialogVisible2 = false">关闭</el-button>
+        </span>
+      </div>
+    </span>
+    <div class="crud-opts2">
+      <span class="role-span">入库单据明细项</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="this.openParam"
+        style="width: 100%;"
+        max-height="300"
+        border
+        highlight-current-row
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @row-click="clcikRow"
+      >
+        <el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="批次" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column show-overflow-tooltip prop="assign_qty" :formatter="crud.formatNum3" label="已分配数量" align="center" />
+        <el-table-column show-overflow-tooltip prop="unassign_qty" :formatter="crud.formatNum3" label="未分配数量" align="center" />
+        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" align="center" />
+      </el-table>
+    </el-card>
+<!--    <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini">
+        <el-form-item prop="checked">
+          <el-checkbox v-model="form.checked" true-label="1" false-label="0" @change="checkedChange()">仅显示未完成的任务</el-checkbox>
+        </el-form-item>
+      </el-form>
+    </el-card>-->
+    <div class="crud-opts2">
+      <span class="role-span">入库单据任务项</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="dis_del"
+          @click="delTask()"
+        >
+          删除
+        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="dis_send"
+          @click="sendTask()"
+        >
+          下发
+        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="dis_confirm"
+          @click="confirmTask()"
+        >
+          标识完成
+        </el-button>
+      </span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="disTable"
+        :data="form.tableMater"
+        style="width: 100%;"
+        max-height="300"
+        :row-class-name="tableRowClassName"
+        highlight-current-row
+        border
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @row-click="clcikDisRow"
+      >
+        <el-table-column width="60" prop="seq_no" label="序号" align="center" />
+        <el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" align="center" />
+        <el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" align="center" />
+        <el-table-column show-overflow-tooltip width="170" prop="pcsn" label="批次" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column show-overflow-tooltip prop="point_code1" label="起始位置" align="center" />
+        <el-table-column show-overflow-tooltip prop="point_code2" label="目的位置" align="center" />
+        <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
+        <el-table-column show-overflow-tooltip prop="task_status" label="任务状态" align="center" :formatter="formatStatus"/>
+        <el-table-column show-overflow-tooltip prop="task_type" label="任务类型" align="center" width="150px" :formatter="formatType"/>
+      </el-table>
+    </el-card>
+
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud } from '@crud/crud'
+import crudProductOut from '@/views/wms/storage_manage/product/productOut/productout'
+
+export default {
+  name: 'TaskDialog',
+  components: {},
+  mixins: [crud()],
+  dicts: ['SCH_TASK_TYPE_DTL', 'task_status'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    bussConfig: {
+      type: Object
+    },
+    openParam: {
+      type: Array,
+      default: () => { return [] }
+    }
+  },
+  data() {
+    return {
+      dialogVisible2: false,
+      dis_row: null,
+      dis_del: true,
+      dis_send: true,
+      dis_confirm: true,
+      fullscreenLoading: false,
+      form: {
+        tableMater: [],
+        dtl_row: null,
+        checked: '1'
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible2 = newValue
+      }
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('update:dialogShow', false)
+      this.form.tableMater = []
+      this.form.checked = '1'
+      this.form.dtl_row = null
+      this.$emit('AddChanged')
+    },
+    clcikRow(row) {
+      this.form.dtl_row = row
+      this.queryTableDdis()
+    },
+    clcikDisRow(row) {
+      debugger
+      this.dis_row = row
+      if (this.dis_row.task_status < 5) {
+        this.dis_del = false
+        this.dis_send = false
+      } else {
+        this.dis_del = true
+        this.dis_send = true
+      }
+      if (this.dis_row.task_status < 7) {
+        this.dis_confirm = false
+      } else {
+        this.dis_confirm = true
+      }
+    },
+    delTask() {
+      this.fullscreenLoading = true
+      crudProductOut.delTask({ 'iostorinvdis_id': this.dis_row.iostorinvdis_id }).then(res => {
+        this.crud.notify('删除成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.fullscreenLoading = false
+        this.queryTableDdis()
+        this.initFlag()
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
+    },
+    sendTask() {
+      this.fullscreenLoading = true
+      crudProductOut.sendTask({ 'task_id': this.dis_row.task_id }).then(res => {
+        this.crud.notify('下发成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.fullscreenLoading = false
+        this.queryTableDdis()
+        this.initFlag()
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
+    },
+    confirmTask() {
+      this.fullscreenLoading = true
+      crudProductOut.confirmTask({ 'task_id': this.dis_row.task_id }).then(res => {
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.fullscreenLoading = false
+        this.queryTableDdis()
+        this.initFlag()
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      row.index = rowIndex
+    },
+    queryTableDdis() {
+      if (this.form.dtl_row !== null) {
+        crudProductOut.getIosInvDis({ 'iostorinvdtl_id': this.form.dtl_row.iostorinvdtl_id }).then(res => {
+          this.form.tableMater = res
+        }).catch(() => {
+          this.form.tableMater = []
+        })
+      }
+    },
+    formatStatus(row) {
+      return this.dict.label.task_status[row.task_status]
+    },
+    formatType(row) {
+      return this.dict.label.SCH_TASK_TYPE_DTL[row.task_type]
+    },
+    initFlag() {
+      this.dis_del = true
+      this.dis_send = true
+      this.dis_confirm = true
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+
+.input-with-select  {
+  background-color: #fff;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
index 7d395134..bf5c6e7e 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
@@ -101,6 +101,17 @@
         >
           分配
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="task_flag"
+          @click="taskOpen"
+        >
+          作业任务
+        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -170,6 +181,7 @@
     <AddDialog @AddChanged="querytable" />
     <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
     <DivDialog :dialog-show.sync="divShow" :open-array="openParam" :stor-id="storId" :row-mst="mstrow" @DivChanged="querytable" />
+    <TaskDialog :dialog-show.sync="taskShow" :open-param="taskOpenParam" />
   </div>
 </template>
 
@@ -184,10 +196,11 @@ import AddDialog from '@/views/wms/storage_manage/product/productOut/AddDialog'
 import DivDialog from '@/views/wms/storage_manage/product/productOut/DivDialog'
 import ViewDialog from '@//views/wms/storage_manage/product/productOut/ViewDialog'
 import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
+import TaskDialog from '@/views/wms/storage_manage/product/productOut/TaskDialog'
 
 export default {
   name: 'ProductOut',
-  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog },
+  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog, TaskDialog },
   cruds() {
     return CRUD({ title: '用户', idField: 'iostorinv_id', url: 'api/productOut', crudMethod: { ...productOut },
       optShow: {
@@ -209,10 +222,12 @@ export default {
         edit: ['admin', 'checkoutbill:edit'],
         del: ['admin', 'checkoutbill:del']
       },
+      task_flag: true,
       openMoneyDialog: false,
       loadingConfirm: false,
       divShow: false,
       taskShow: false,
+      taskOpenParam: [],
       dis_flag: true,
       work_flag: true,
       confirm_flag: true,
@@ -281,6 +296,11 @@ export default {
         } else {
           this.confirm_flag = true
         }
+        if (current.bill_status !== '99') {
+          this.task_flag = false
+        } else {
+          this.task_flag = true
+        }
       }
     },
     stateFormat(row, column) {
@@ -294,6 +314,7 @@ export default {
         this.dis_flag = true
         this.confirm_flag = true
         this.work_flag = true
+        this.task_flag = true
         this.currentRow = {}
       }
     },
@@ -308,6 +329,12 @@ export default {
         this.mstrow = this.currentRow
       })
     },
+    taskOpen() {
+      productOut.getIosInvDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+        this.taskOpenParam = res
+      })
+      this.taskShow = true
+    },
     confirm() {
       this.loadingConfirm = true
       productOut.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js b/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
index 14f7e2d8..f1b19c92 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
@@ -88,6 +88,30 @@ export function manualDiv(data) {
   })
 }
 
+export function delTask(data) {
+  return request({
+    url: '/api/productOut/delTask',
+    method: 'post',
+    data
+  })
+}
+
+export function sendTask(data) {
+  return request({
+    url: '/api/productOut/sendTask',
+    method: 'post',
+    data
+  })
+}
+
+export function confirmTask(data) {
+  return request({
+    url: '/api/productOut/confirmTask',
+    method: 'post',
+    data
+  })
+}
+
 export default {
   add,
   edit,
@@ -99,5 +123,8 @@ export default {
   setPoint,
   confirm,
   getStructIvt,
-  manualDiv
+  manualDiv,
+  delTask,
+  sendTask,
+  confirmTask
 }

From 531f9780e114ab555912341ac9fb873703c8a1b1 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Tue, 13 Jun 2023 08:58:04 +0800
Subject: [PATCH 18/19] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2crud?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/common/domain/query/BaseQuery.java |   5 +-
 .../rest/DeviceScreenController.java          |   1 -
 .../PdmProduceWorkorderController.java        |  21 +-
 .../sch/tasks/SpeMachinery/SpeEmpTask.java    |   5 +-
 .../sch/tasks/SpeMachinery/SpeFullTask.java   |  13 +-
 .../device/dao/mapper/PdmBiDeviceMapper.xml   |   5 +-
 .../dao/mapper/PdmProduceWorkorderMapper.xml  |   3 +
 .../xml/PdmProduceWorkorderrecordMapper.xml   |  18 +-
 .../service/workorder/dto/ReportQuery.java    |   4 +-
 .../service/workorder/dto/WorkorderQuery.java |   1 +
 .../impl/IPdmProduceWorkorderServiceImpl.java |  17 +-
 .../task/impl/SchBaseTaskServiceImpl.java     |   3 +-
 .../resources/config/application-dev3.yml     |  12 +-
 .../src/main/resources/logback-spring.xml     |   3 +-
 .../device_manage/deviceMaterial/index.vue    |  86 ++++----
 .../device_manage/deviceMaterial/备份.vue   | 156 +++++++++++++
 .../wms/product_manage/workorder/index.vue    |  26 ++-
 .../workorder/produceshiftorder.js            |   2 +-
 .../product_manage/workorder/reportDialog.vue | 121 +++++++---
 .../workorder/reportDialog3.vue               | 208 ++++++++++++++++++
 .../views/wms/scheduler_manage/task/index.vue |  10 +-
 21 files changed, 595 insertions(+), 125 deletions(-)
 create mode 100644 mes/qd/src/views/wms/device_manage/deviceMaterial/备份.vue
 create mode 100644 mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java
index 99c21374..32cd6204 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java
@@ -9,6 +9,7 @@ import java.util.Date;
 
 import org.nl.common.enums.QueryTEnum;
 import org.nl.common.utils.MapOf;
+import org.springframework.format.annotation.DateTimeFormat;
 import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
 
 import java.lang.reflect.Type;
@@ -33,8 +34,8 @@ public class BaseQuery<T> {
     /**
      * 创建时间范围查询
      */
-    private Date start_time;
-    private Date end_time;
+    private String start_time;
+    private String end_time;
 
 
     /**
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
index c7a6a530..54faceba 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
@@ -49,7 +49,6 @@ public class DeviceScreenController {
     }
 
     @PostMapping("/deviceManage")
-    @Log("设备管理")
     @ApiOperation("设备管理")
     public ResponseEntity<Object> deviceManage(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(deviceScreenService.deviceManage(whereJson), HttpStatus.OK);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
index eb1d1716..f3232273 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
@@ -5,6 +5,8 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -30,6 +32,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -159,17 +162,19 @@ public class PdmProduceWorkorderController {
         return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)),HttpStatus.OK);
     }
 
-    @PostMapping("/reportQuery2")
+    @GetMapping("/reportQuery2")
     @Log("报工数修改")
     @ApiOperation("报工数修改")
     @SaIgnore
-    public ResponseEntity<Object> reportQuery2(@RequestBody ReportQuery param) {
-        return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)),HttpStatus.OK);
+    public ResponseEntity<Object> reportQuery2(ReportQuery param ,PageQuery pageQuery) {
+        Page<Object> page = PageHelper
+                .startPage(pageQuery.getPage()+1, pageQuery.getSize())
+                .setOrderBy("workorder_code desc,seq_number asc");
+        param.setOrderby("true");
+        List<Map> list = iPdmProduceWorkorderService.reportQuery(param);
+        TableDataInfo<Map> build = TableDataInfo.build(list);
+        build.setTotalElements(page.getTotal());
+        return new ResponseEntity<>(build,HttpStatus.OK);
     }
-
-
-
-
-
 }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
index f1abcfa2..ab310938 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
@@ -15,6 +15,7 @@ import org.nl.common.enums.StatusEnum;
 import org.nl.common.enums.WorkerOrderEnum;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.MapOf;
+import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
@@ -80,7 +81,9 @@ public class SpeEmpTask extends AbstractAcsTask {
     public void updateTaskStatus(JSONObject param,String status) {
         SchBaseTask task = taskService.getOne(new QueryWrapper<SchBaseTask>().eq("task_id", param.getString("task_id")));
         try {
-            SpeHandles.get(task.getTask_name()).handle(param,status,task);
+            RedissonUtils.lock(()->{
+                SpeHandles.get(task.getTask_name()).handle(param,status,task);
+            },param.getString("task_id")+status,2);
         }catch (Exception ex){
             log.error("更新状态异常updateTaskStatus param:{},status:{},ex:{}",param,status,ex);
             throw ex;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
index d652b1af..7ef63ec2 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
@@ -14,6 +14,7 @@ import org.nl.common.enums.StatusEnum;
 import org.nl.common.enums.WorkerOrderEnum;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.MapOf;
+import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
@@ -81,7 +82,9 @@ public class SpeFullTask extends AbstractAcsTask {
         SchBaseTask task = taskService.getById(param.getString("task_id"));
         pointService.update(new UpdateWrapper<SchBasePoint>().set("lock_type","0").in("point_code",task.getPoint_code1(),task.getPoint_code2(),task.getPoint_code3()));
         try {
-            SpeHandles.get(task.getTask_name()).handle(param,status,task);
+            RedissonUtils.lock(()->{
+                SpeHandles.get(task.getTask_name()).handle(param,status,task);
+            },param.getString("task_id")+status,2);
         }catch (Exception ex){
             log.error(OPT_NAME+"updateStatus error:{}",ex);
             throw ex;
@@ -276,6 +279,14 @@ public class SpeFullTask extends AbstractAcsTask {
                             .set("task_status",StatusEnum.TASK_FINISH.getCode())
                             .set("update_name","acs")
                             .set("update_time",DateUtil.now()).eq("task_id",task.getTask_id()));
+                    PdmBiDevice one = deviceService.getOne(new QueryWrapper<PdmBiDevice>().eq("device_code", task.getPoint_code2()));
+                    if (!("fall_finish"+task.getTask_id()).equals(one.getRemark())){
+                        deviceService.update(new UpdateWrapper<PdmBiDevice>()
+                                .set("material_id", task.getMaterial_id())
+                                .set("deviceinstor_qty",one.getDeviceinstor_qty().add(task.getMaterial_qty()))
+                                .set("remark","fall_finish"+task.getTask_id())
+                                .eq("device_code", task.getPoint_code2()));
+                    }
                     break;
                 case STATUS_CANNEL:
                     cancel(param.getString("task_id"));
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 df9d90ee..a0f7ff91 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,8 +40,9 @@
     <select id="workproceduceDevicesWeight" resultType="java.util.Map">
         select
         GROUP_CONCAT(sch_base_task.task_id) as tasks,GROUP_CONCAT(sch_base_task.material_id) as materials,GROUP_CONCAT(md_me_materialbase.net_weight) as weights,
-        pdm_bi_device.inupperlimit_qty - ifnull( sum( sch_base_task.material_qty*md_me_materialbase.net_weight ), 0 ) - pdm_bi_device.deviceinstor_qty AS currentQty,
+        pdm_bi_device.inupperlimit_qty - ifnull( sum( sch_base_task.material_qty*md_me_materialbase.net_weight ), 0 ) - pdm_bi_device.deviceinstor_weight AS currentQty,
         pdm_bi_device.device_code,
+        pdm_bi_device.inupperlimit_qty,
         sch_base_point.point_code
         from sch_base_point
         left join pdm_bi_device on pdm_bi_device.device_code = sch_base_point.device_code
@@ -58,7 +59,7 @@
             and (pdm_bi_device.spec = #{spec} or pdm_bi_device.spec is null)
         </if>
         GROUP BY pdm_bi_device.device_code
-        HAVING currentQty > #{qty}
+        HAVING currentQty > #{qty} and  pdm_bi_device.inupperlimit_qty > currentQty
     </select>
 
     <select id="getDeviceByPoint" resultType="org.nl.wms.product_manage.service.device.dao.PdmBiDevice">
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
index a3e23b72..6fd151f0 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
@@ -24,6 +24,9 @@
         <if test="query.order_status != null and query.order_status != ''">
             and find_in_set(ShiftOrder.workorder_status, #{query.order_status})
         </if>
+        <if test="query.device_code != null and query.device_code != ''">
+            and ShiftOrder.device_code =  #{query.device_code}
+        </if>
         <if test="query.shift_type_scode != null and query.shift_type_scode != ''">
             and ShiftOrder.shift_type_scode =  #{query.shift_type_scode}
         </if>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml
index a018a7db..4a92b47c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml
@@ -19,24 +19,26 @@
         <if test="query.device_code != null and query.device_code != ''">
             and wr.device_code =  #{query.device_code}
         </if>
-        <if test="query.workorder_code != null and query.workorder_code != ''">
-            and wr.workorder_code =  #{query.workorder_code}
+        <if test="query.report_status != null and query.report_status != ''">
+            and re.report_status in  ( ${query.report_status})
         </if>
         <if test="query.workorder_id != null and query.workorder_id != ''">
             and wr.workorder_id =  #{query.workorder_id}
         </if>
-        <if test="query.start_time != null and query.start_time != ''">
-            and wr.realproducestart_date >=  #{query.start_time}
+        <if test="query.shift_type_scode != null and query.shift_type_scode != ''">
+            and wr.shift_type_scode =  #{query.shift_type_scode}
         </if>
-        <if test="query.start_time != null and query.start_time != ''">
-            and wr.realproducestart_date >=  #{query.start_time}
+        <if test="query.begin_time != null and query.begin_time != ''">
+            and re.operatetime_start >=  #{query.begin_time}
         </if>
         <if test="query.end_time != null and query.end_time != ''">
-            and  #{query.end_time} >= wr.realproducestart_date
+            and  #{query.end_time} >= re.operatetime_start
         </if>
         <if test="query.user_id != null and query.user_id != ''">
             and  wr.current_produce_person_id = #{query.user_id}
         </if>
-        order by workorder_code desc,seq_number asc
+        <if test="query.orderby == null and query.user_id == ''">
+            order by workorder_code desc,seq_number asc
+        </if>
     </select>
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java
index 02e621f7..c5c2f1c3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java
@@ -20,10 +20,12 @@ public class ReportQuery  {
     private String workorder_code;
     private String workorder_id;
     private String report;
-    private String start_time;
+    private String begin_time;
     private String end_time;
+    private String shift_type_scode;
     private String user_id;
     private Boolean is_report =false;
     private String report_status;
+    private String orderby;
 
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java
index 019065eb..5436212b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java
@@ -18,6 +18,7 @@ import java.util.Map;
 public class WorkorderQuery extends BaseQuery<PdmProduceWorkorder> {
 
     private String workorder_code;
+    private String device_code;
     private String material;
     private String order_status;
     private String workprocedure_code;
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 c2a3f5ed..1d488e2d 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
@@ -152,6 +152,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         entity.setDown_time(DateUtil.now());
         entity.setDown_id(SecurityUtils.getCurrentUserId());
         entity.setDown_name(SecurityUtils.getCurrentNickName());
+        entity.setReal_qty(null);
         this.updateById(entity);
 
         this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE, entity.getWorkorder_id());
@@ -322,6 +323,9 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                         if (j == 9) {
                             workorder.setPlan_qty(new BigDecimal(Long.valueOf(col)));
                         }
+                        if (j == 13) {
+                            workorder.setIs_needmove(col.equals("是")?true:false);
+                        }
                     }
                 }
                 if (CollectionUtils.isEmpty(errorMap)){
@@ -583,10 +587,15 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         if (!workorder.getIs_canupdate_update()){
             throw new BadRequestException("当前工单设置为不允许修改报工记录");
         }
-        reportRecordService.update(new UpdateWrapper<PdmProduceWorkorderrecord>()
-                .set("nok_qty",param.getBigDecimal("nok_qty"))
-                .set("repare_qty",param.getBigDecimal("repare_qty"))
-                .set("report_qty",param.getBigDecimal("report_qty"))
+        UpdateWrapper<PdmProduceWorkorderrecord> updateWrapper = new UpdateWrapper<>();
+        if (param.getBigDecimal("nok_qty")!=null){
+            updateWrapper.set("nok_qty",param.getBigDecimal("nok_qty"));
+        }
+        if (param.getBigDecimal("repare_qty")!=null){
+            updateWrapper.set("repare_qty",param.getBigDecimal("repare_qty"));
+        }
+        updateWrapper.set("report_qty",param.getBigDecimal("report_qty"));
+        reportRecordService.update(updateWrapper
                 .eq("macoperate_id", param.getString("macoperate_id")));
     }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java
index 91f30a18..a8cfd726 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java
@@ -68,8 +68,9 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
                     try {
                         AbstractAcsTask taskHandler = (AbstractAcsTask) SpringContextHolder.getBean(Class.forName(taskObj.getHandle_class()));
                         taskHandler.pointConfirm((JSONObject) JSONObject.toJSON(taskObj));
+                        SchBaseTask task = this.getOne(new QueryWrapper<SchBaseTask>().eq("task_id", task_id));
                         JSONArray array = new JSONArray();
-                        array.add(taskObj);
+                        array.add(JSON.toJSON(task));
                         wms.issueTaskToAcs(array);
                     }catch (Exception ex){
                         taskObj.setTask_status(StatusEnum.TASK_START_ERROR.getCode());
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
index 308d1e43..a1268ad0 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
@@ -10,24 +10,24 @@ spring:
         reactive:
           #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网
           #          endpoints: 47.96.133.178:8200 #外网
-          endpoints: http://192.168.46.225:9200 #外网
+          endpoints: http://127.0.0.1:9200 #外网
   elasticsearch:
     rest:
       #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网
       #      uris: 47.96.133.178:8200 #外网
-      uris: http://192.168.46.225:9200 #外网
-  #      username: elastic
-  #      password: 123456
+      uris: http://127.0.0.1:9200 #外网
+#      username: elastic
+#      password: 123456
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       #      password: ${DB_PWD:123456}
-      password: ${DB_PWD:123456}
+      password: ${DB_PWD:942464Yy}
 
       # 初始连接数
       initial-size: 5
diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
index 7f2c8ca5..c26c828a 100644
--- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -146,9 +146,8 @@ https://juejin.cn/post/6844903775631572999
         </logger>
     </springProfile>
     <springProfile name="dev3">
-        <root level="info">
+        <root level="debug">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="esLogAppender"/>
         </root>
 
         <logger name="jdbc.audit" level="ERROR" additivity="false">
diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
index 0f1a3a2f..3f2205cc 100644
--- a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
+++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
@@ -1,45 +1,50 @@
 <template>
   <div class="app-container">
     <!--表单组件-->
-    <el-dialog
-      append-to-body
-      :close-on-click-modal="false"
-      :before-close="crud.cancelCU"
-      :visible="crud.status.cu > 0"
-      :title="crud.status.title"
-      width="500px"
-    >
-      <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="物料系列" prop="code">
-          <el-input v-model="form.material_spec" style="width: 370px;" />
-        </el-form-item>
-        <el-form-item label="工序调度编号">
-          <el-input v-model="form.process_id" style="width: 370px;" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-      </div>
-    </el-dialog>
     <!-- 字典列表 -->
     <el-card class="box-card">
       <!--工具栏-->
       <div class="head-container">
         <div v-if="crud.props.searchToggle">
           <!-- 搜索 -->
-          <el-input
-            v-model="query.search"
-            clearable
-            size="mini"
-            placeholder="设备编号模糊查询"
-            style="width: 200px;"
-            class="filter-item"
-            @keyup.enter.native="crud.toQuery"
-          />
-          <rrOperation :permission="permission" />
+          <el-form
+            :inline="true"
+            class="demo-form-inline"
+            label-position="right"
+            label-width="90px"
+            label-suffix=":"
+          >
+            <el-form-item label="生产车间">
+              <el-select
+                v-model="form.product_area"
+                placeholder=""
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="item in dict.product_area"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设备编号">
+              <el-input
+                v-model="query.search"
+                clearable
+                size="mini"
+                placeholder="设备编号模糊查询"
+                style="width: 200px;"
+                class="filter-item"
+                @keyup.enter.native="crud.toQuery"
+              />
+            </el-form-item>
+            <el-form-item label="设备编号">
+              <rrOperation :permission="permission" />
+            </el-form-item>
+          </el-form>
         </div>
-        <crudOperation :permission="permission" />
+        <crudOperation v-show="false" :permission="permission" />
       </div>
       <!--表格渲染-->
 
@@ -79,12 +84,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <MaterDtl
-        :dialog-show.sync="materialShow"
-        :is-single="true"
-        :mater-opt-code="materType"
-        @setMaterValue="setMaterValue"
-      />
       <!--分页组件-->
       <pagination />
     </el-card>
@@ -97,13 +96,13 @@ import CRUD, { presenter, header, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
-import MaterDtl from '@/views/wms/pub/MaterDialog'
 
 const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240', device_code: null, material_id: null, material_name: null, material_spec: null, deviceinstor_qty: null, deviceinstor_weight: null, remark: null }
 
 export default {
   name: 'SKdevice',
-  components: { crudOperation, pagination, rrOperation, MaterDtl },
+  components: { crudOperation, pagination,  rrOperation },
+  dicts: ['product_area'],
   cruds() {
     return [
       CRUD({ title: '深坑设备物料', url: 'api/specialDevice/query', query: { product_area: 'A1', workprocedure_id: '1535144552481034240' }, idField: 'device_code', crudMethod: { ...crudDevice }})
@@ -141,13 +140,6 @@ export default {
       }).catch(() => {
       })
     },
-    setMaterValue(row) {
-      this.nowrow.material_id = row.material_id
-      this.nowrow.material_code = row.material_code
-      this.nowrow.material_name = row.material_name
-      this.nowrow.material_spec = row.material_spec
-      this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
-    }
   }
 }
 </script>
diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/备份.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/备份.vue
new file mode 100644
index 00000000..8d8609d3
--- /dev/null
+++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/备份.vue
@@ -0,0 +1,156 @@
+<template>
+  <div class="app-container">
+    <!--表单组件-->
+    <el-dialog
+      append-to-body
+      :close-on-click-modal="false"
+      :before-close="crud.cancelCU"
+      :visible="crud.status.cu > 0"
+      :title="crud.status.title"
+      width="500px"
+    >
+      <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-form-item label="物料系列" prop="code">
+          <el-input v-model="form.material_spec" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="工序调度编号">
+          <el-input v-model="form.process_id" style="width: 370px;" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+      </div>
+    </el-dialog>
+    <!-- 字典列表 -->
+    <el-card class="box-card">
+      <!--工具栏-->
+      <div class="head-container">
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-input
+            v-model="query.search"
+            clearable
+            size="mini"
+            placeholder="设备编号模糊查询"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+          <rrOperation :permission="permission" />
+        </div>
+        <crudOperation :permission="permission" />
+      </div>
+      <!--表格渲染-->
+
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+        @current-change="handleCurrentChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="product_area" label="生产车间" width="100px" show-overflow-tooltip />
+        <el-table-column prop="device_code" label="设备编码" width="100px" show-overflow-tooltip />
+        <el-table-column prop="material_id" label="物料id" width="200px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.material_id">
+              <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
+            </el-input>
+          </template>
+        </el-table-column>
+        <el-table-column prop="material_name" label="物料名称" width="200px" show-overflow-tooltip />
+        <el-table-column prop="material_spec" label="物料规格" width="200px" show-overflow-toolti />
+        <el-table-column prop="deviceinstor_qty" label="物料数量(个)" align="center" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.deviceinstor_qty" /></template>
+        </el-table-column>
+        <el-table-column prop="deviceinstor_weight" label="物料重量(g)" align="center" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.deviceinstor_weight" /></template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
+        <el-table-column label="操作" width="150px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="updateSKMaterial(scope.row)">提交修改</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <MaterDtl
+        :dialog-show.sync="materialShow"
+        :is-single="true"
+        :mater-opt-code="materType"
+        @setMaterValue="setMaterValue"
+      />
+      <!--分页组件-->
+      <pagination />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import crudDevice from '@/views/wms/device_manage/deviceMaterial/deviceMaterial.js'
+import CRUD, { presenter, header, form } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import MaterDtl from '@/views/wms/pub/MaterDialog'
+
+const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240', device_code: null, material_id: null, material_name: null, material_spec: null, deviceinstor_qty: null, deviceinstor_weight: null, remark: null }
+
+export default {
+  name: 'SKdevice',
+  components: { crudOperation, pagination, rrOperation, MaterDtl },
+  cruds() {
+    return [
+      CRUD({ title: '深坑设备物料', url: 'api/specialDevice/query', query: { product_area: 'A1', workprocedure_id: '1535144552481034240' }, idField: 'device_code', crudMethod: { ...crudDevice }})
+    ]
+  },
+  mixins: [presenter(), header(), form(defaultForm)],
+  data() {
+    return {
+      materialShow: false,
+      queryTypeOptions: [
+        { key: 'name', display_name: '字典名称' },
+        { key: 'description', display_name: '描述' }
+      ],
+      rules: {
+        material_spec: [
+          { required: true, message: '请输入编码', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    queryMater(index, row) {
+      this.materialShow = true
+      this.nowindex = index
+      this.nowrow = row
+    },
+    updateSKMaterial(row) {
+      crudDevice.edit(row).then(() => {
+        this.notify('保存成功', 'success')
+      }).catch(() => {
+      })
+    },
+    setMaterValue(row) {
+      this.nowrow.material_id = row.material_id
+      this.nowrow.material_code = row.material_code
+      this.nowrow.material_name = row.material_name
+      this.nowrow.material_spec = row.material_spec
+      this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
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 919cfcda..f93625e7 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/index.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue
@@ -48,7 +48,16 @@
               class="filter-item"
             />
           </el-form-item>
-
+          <el-form-item label="设备搜索">
+            <el-input
+              v-model="query.device_code"
+              clearable
+              size="small"
+              placeholder="设备编号"
+              style="width: 200px;"
+              class="filter-item"
+            />
+          </el-form-item>
           <el-form-item label=" 工单状态">
             <el-select
               v-model="order_status"
@@ -384,19 +393,16 @@
         <!--        <el-table-column prop="workprocedure_code" label="工序编码" />-->
         <el-table-column prop="product_area" label="生产车间" />
         <el-table-column prop="plan_qty" label="计划数量" />
-        <el-table-column prop="real_qty" label="报工总数" />
-        <el-table-column prop="nok_qty" label="报废总数" />
-        <el-table-column prop="report_qty" label="报修总数" />
-        <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
         <el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip />
-        <el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip />
+        <el-table-column prop="real_qty" label="报工总数" />
+        <el-table-column prop="material_spec" label="物料规格" width="120" show-overflow-tooltip />
+        <el-table-column prop="device_code" label="当前设备编码" width="100" show-overflow-tooltip />
         <el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip />
         <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4" />
         <el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip />
         <el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
         <el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
         <el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip />
-        <el-table-column prop="device_code" label="当前设备编码" width="100" show-overflow-tooltip />
         <el-table-column prop="is_canupdate_update" label="允许修改报工数" :formatter="formatBoolean" width="200" show-overflow-tooltip>
          </el-table-column>
         <el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean" />
@@ -413,6 +419,9 @@
         <el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常"></el-table-column>
         <el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
         <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="nok_qty" label="报废总数" />
+        <el-table-column prop="report_qty" label="报修总数" />
+        <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
         <el-table-column prop="current_produce_person_name" label="操作工" show-overflow-tooltip />
         <el-table-column prop="create_name" label="创建人" show-overflow-tooltip />
         <el-table-column prop="create_time" label="创建时间" show-overflow-tooltip />
@@ -579,6 +588,9 @@ export default {
     this.initClass3()
   },
   methods: {
+    databaseUploadApi(){
+
+    },
     formatBoolean: function(row, column) {
       var ret = ''
       if (row[column.property] === true) {
diff --git a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js
index af73563c..44d2ba5a 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js
+++ b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js
@@ -106,7 +106,7 @@ export function getReportWork(data) {
 export function reportQuery(data) {
   return request({
     url: '/api/produceWorkorder/reportQuery2',
-    method: 'post',
+    method: 'get',
     data
   })
 }
diff --git a/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
index 3dbdb1fe..ecfb875a 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
@@ -4,29 +4,51 @@
     append-to-body
     fullscreen
     :visible.sync="dialogVisible"
-    @open="open"
     @close="close"
   >
-    <el-card class="box-card" shadow="never">
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="180px">
+    <div>
+      <el-form ref="form" :inline="true"  :rules="rules" size="mini" label-width="180px">
         <el-form-item label="工单编码">
-          <el-input v-model="form.workorder_code" style="width: 200px;" clearable/>
+          <el-input v-model="query.workorder_code" style="width: 200px;" clearable/>
+        </el-form-item>
+        <el-form-item label="班次类型" prop="shift_type_scode">
+          <el-select
+            v-model="query.shift_type_scode"
+            style="width: 200px"
+            clearable
+            filterable
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in dict.PDM_BI_SHIFTTYPE"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="生产日期">
+          <el-date-picker
+            v-model="query.createTime"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['00:00:00','23:59:59']"
+          />
         </el-form-item>
         <el-form-item label="只显示未审核">
           <el-switch
-            v-model="form.is_report"
+            v-model="query.is_report"
             active-color="#409EFF"
             inactive-color="#F56C6C"
             active-value='true'
             inactive-valu='false'
           />
         </el-form-item>
-        <el-dropdown split-button type="primary" class="filter-item" @click="report()">
-          <i class="el-icon-search el-icon--left" />查询
-        </el-dropdown>
+        <rrOperation :crud="crud" />
       </el-form>
-
-    </el-card>
+    </div>
     <div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
       <span class="role-span">工单生产记录详情</span>
       <span class="crud-opts-right2">
@@ -38,7 +60,8 @@
     <!--表格渲染-->
     <el-table
       ref="table"
-      :data="tableData"
+      v-loading="crud.loading"
+      :data="crud.data"
       style="width: 100%;"
       max-height="600"
       border
@@ -60,17 +83,17 @@
           <el-input v-model = scope.row.report_qty></el-input>
         </template>
       </el-table-column>
-      <el-table-column prop="nok_qty" label="报废数量" >
-        <template slot-scope="scope">
-          <el-input v-model = scope.row.nok_qty></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column prop="repare_qty" label="报修数量" >
-        <template slot-scope="scope">
-          <el-input v-model = scope.row.repare_qty></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column prop="person_finish_qty" label="人员期末数量" />
+<!--      <el-table-column prop="nok_qty" label="报废数量" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input v-model = scope.row.nok_qty></el-input>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column prop="repare_qty" label="报修数量" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input v-model = scope.row.repare_qty></el-input>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column prop="person_finish_qty" label="人员期末数量" />-->
       <el-table-column prop="operatetime_start" label="开工时间" />
       <el-table-column prop="operatetime_end" label="完工时间" />
       <el-table-column prop="report_status" label="报工状态" >
@@ -89,8 +112,7 @@
 
     </el-table>
     <!--分页组件-->
-<!--    <pagination />-->
-
+    <pagination />
     <span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">取 消</el-button>
       <el-button type="primary" @click="dialogVisible = false">确定</el-button>
@@ -101,12 +123,56 @@
 <script>
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
+import CRUD, { presenter, header, form } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+
+const defaultForm = { sale_id: null,
+  is_report: null,
+  workorder_id: null,
+  workorder_code: null,
+  producedeviceorder_code: null,
+  shift_type_scode: null,
+  workprocedure_id: null,
+  produce_date: null,
+  plan_qty: null,
+  real_qty: null,
+  report_qty: null,
+  material_id: null,
+  material_code: null,
+  material_weight: null,
+  planproducestart_date: null,
+  planproduceend_date: null,
+  realproducestart_date: null,
+  realproduceend_date: null,
+  order_status: null,
+  is_needmove: null,
+  order_type_scode: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  sysdeptid: null,
+  syscompanyid: null,
+  is_delete: null,
+  material_name: null,
+  device_id: null,
+  is_canupdate_update: null,
+  material_spec: null }
 
 export default {
   name: 'ViewDialog',
-  components: {  },
+  components: { crudOperation, pagination,  rrOperation },
+  cruds() {
+    return [
+      CRUD({ title: '报工审核', url: '/api/produceWorkorder/reportQuery2', query: {}, idField: 'macoperate_id', crudMethod: { ...crudProduceshiftorder }})
+    ]
+  },
   dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
-  mixins: [],
+  mixins: [presenter(), header(), form(defaultForm)],
   props: {
     dialogShow: {
       type: Boolean,
@@ -194,8 +260,7 @@ export default {
       const arr = []
       arr.push(data)
       crudProduceshiftorder.reportApprove(arr).then(res => {
-        this.tableData = res.content
-        this.report()
+       //todo:刷新数据
       })
     },
     setForm() {
diff --git a/mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue b/mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue
new file mode 100644
index 00000000..d94f97bb
--- /dev/null
+++ b/mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue
@@ -0,0 +1,208 @@
+<template>
+  <div class="app-container">
+    <!--表单组件-->
+    <!-- 字典列表 -->
+    <el-card class="box-card">
+      <!--工具栏-->
+      <div class="head-container">
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-form ref="form" :inline="true"  :rules="rules" size="mini" label-width="180px">
+            <el-form-item label="工单编码">
+              <el-input v-model="query.workorder_code" style="width: 200px;" clearable/>
+            </el-form-item>
+            <el-form-item label="班次类型" prop="shift_type_scode">
+              <el-select
+                v-model="query.shift_type_scode"
+                style="width: 200px"
+                clearable
+                filterable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in dict.PDM_BI_SHIFTTYPE"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="生产日期">
+              <el-date-picker
+                v-model="query.create_time"
+                type="daterange"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="['00:00:00','23:59:59']"
+              />
+            </el-form-item>
+            <el-form-item label="只显示未审核">
+              <el-switch
+                v-model="query.is_report"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+                active-value='true'
+                inactive-valu='false'
+              />
+            </el-form-item>
+            <el-dropdown split-button type="primary" class="filter-item" @click="report()">
+              <i class="el-icon-search el-icon--left" />查询
+            </el-dropdown>
+          </el-form>
+        </div>
+        <crudOperation v-show="false" :permission="permission" />
+      </div>
+      <!--表格渲染-->
+
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="workorder_code" label="工单编号" />
+        <el-table-column prop="seq_number" label="报工顺序号" />
+        <el-table-column prop="shift_type_scode" label="班次类型">
+          <template slot-scope="scope">
+            {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="product_area" label="生产车间" />
+        <el-table-column prop="device_code" label="设备编码" align="center" />
+        <el-table-column prop="needproduct_qty" label="待生产数" />
+        <el-table-column prop="report_qty" label="报工数量" >
+          <template slot-scope="scope">
+            <el-input v-model = scope.row.report_qty></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column prop="nok_qty" label="报废数量" >
+          <template slot-scope="scope">
+            <el-input v-model = scope.row.nok_qty></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column prop="repare_qty" label="报修数量" >
+          <template slot-scope="scope">
+            <el-input v-model = scope.row.repare_qty></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column prop="person_finish_qty" label="人员期末数量" />
+        <el-table-column prop="operatetime_start" label="开工时间" />
+        <el-table-column prop="operatetime_end" label="完工时间" />
+        <el-table-column prop="report_status" label="报工状态" >
+          <template slot-scope="scope">
+            {{ reportStatus[scope.row.report_status-1].label }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="produce_person_name" label="操作人" align="center" />
+        <el-table-column prop="confirm_name" label="审核人" align="center" />
+        <el-table-column prop="confirm_time" label="审核时间" align="center" />
+        <el-table-column label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button :disabled="scope.row.report_status =='3'" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="reportApprove(scope.row)">提交审核</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import crudReport from '@/views/wms/product_manage/workorder/produceshiftorder'
+import CRUD, { presenter, header, form } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+const defaultForm = { sale_id: null,
+  is_report: null,
+  workorder_id: null,
+  workorder_code: null,
+  producedeviceorder_code: null,
+  shift_type_scode: null,
+  workprocedure_id: null,
+  produce_date: null,
+  plan_qty: null,
+  real_qty: null,
+  report_qty: null,
+  material_id: null,
+  material_code: null,
+  material_weight: null,
+  planproducestart_date: null,
+  planproduceend_date: null,
+  realproducestart_date: null,
+  realproduceend_date: null,
+  order_status: null,
+  is_needmove: null,
+  order_type_scode: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  sysdeptid: null,
+  syscompanyid: null,
+  is_delete: null,
+  material_name: null,
+  device_id: null,
+  is_canupdate_update: null,
+  material_spec: null }
+
+export default {
+  name: 'reportDialog',
+  components: { crudOperation, pagination,  rrOperation },
+  dicts: ['product_area'],
+  cruds() {
+    return [
+      CRUD({ title: '报工审核', url: '/api/produceWorkorder/reportQuery2', query: {}, idField: 'macoperate_id', crudMethod: { ...crudReport }})
+    ]
+  },
+  mixins: [presenter(), header(), form(defaultForm)],
+  data() {
+    return {
+      trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }],
+      reportStatus: [{ value: '1', label: '创建记录' }, { value: '2', label: '报工完成' }, { value: '3', label: '审核完成' }],
+      queryTypeOptions: [
+        { key: 'name', display_name: '字典名称' },
+        { key: 'description', display_name: '描述' }
+      ],
+      rules: {
+        material_spec: [
+          { required: true, message: '请输入编码', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    report() {
+      crudReport.reportQuery({ workorder_code: this.form.workorder_code, is_report: this.form.is_report }).then(res => {
+        this.tableData = res.content
+      })
+    },
+    reportApprove(data) {
+      const arr = []
+      arr.push(data)
+      crudReport.reportApprove(arr).then(res => {
+        this.tableData = res.content
+        this.report()
+      })
+    },
+    setForm() {
+      this.dialogVisible = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
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 69a2965c..4576e823 100644
--- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue
+++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue
@@ -151,21 +151,21 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="50" />
-        <el-table-column prop="product_area" label="生产车间" />
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
         <el-table-column prop="table_fk_id" label="业务编码" min-width="100" show-overflow-tooltip />
         <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
         <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
-        <el-table-column prop = "acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter = "acsTypeName"></el-table-column>
+        <el-table-column v-if="true" prop="material_spec" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
+        <el-table-column prop = "acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter = "acsTypeName"></el-table-column>
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
         <el-table-column prop="point_code1" label="起点" width="100" />
-        <el-table-column prop="point1_region_name" label="起点区域" width="120" />
         <el-table-column prop="point_code2" label="终点" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="point2_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
         <el-table-column prop="point_code3" label="返回点" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="product_area" label="生产车间" />
+        <el-table-column prop="point1_region_name" label="起点区域" width="120" />
+        <el-table-column prop="point2_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
         <el-table-column prop="point3_region_name" label="返回点区域" min-width="120" show-overflow-tooltip />
         <el-table-column prop="vehicle_code" label="载具编码1" min-width="100" show-overflow-tooltip />
         <el-table-column prop="vehicle_code2" label="载具编码2" min-width="100" show-overflow-tooltip />

From afe0866aed9b8dc835e593fd06b6e68a0af192d1 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Tue, 13 Jun 2023 09:39:26 +0800
Subject: [PATCH 19/19] =?UTF-8?q?rev=20=E5=88=86=E9=A1=B5=E3=80=81?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91plc=E4=B8=A4=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InstructionServiceImpl.java           |  8 ++++----
 .../src/main/java/org/nl/acs/opc/OpcUtl.java           |  2 +-
 .../service/impl/ProduceshiftorderServiceImpl.java     | 10 ++++++----
 .../org/nl/acs/task/service/impl/TaskServiceImpl.java  |  9 +++++----
 .../java/org/nl/acs/task/service/wql/QTASK_QUERY.wql   |  4 +---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index b6861836..142b7f17 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -128,12 +128,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
                     return true;
                 })
                 .sorted((inst1, inst2) -> (inst1.getInstruction_code().compareTo(inst2.getInstruction_code())))
-                .skip((currentPageNumber - 1) * pageMaxSize)
-                .limit(pageMaxSize)
                 .collect(Collectors.toList());
+        List<Instruction> skipList = instructionList.stream().skip((currentPageNumber - 1) * pageMaxSize)
+                .limit(pageMaxSize).collect(Collectors.toList());
         JSONObject jo = new JSONObject();
-        jo.put("content", instructionList);
-        jo.put("totalElements", this.instructions.size());
+        jo.put("content", skipList);
+        jo.put("totalElements", instructionList.size());
         return jo;
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java
index f448de73..b513eea4 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java
@@ -40,7 +40,7 @@ public class OpcUtl {
             Map<Item, Integer> e=null;
             try{
                 e=group.write(requests);
-                group.write(requests);
+                //group.write(requests);
             }catch (Exception e1){
                try{
                    e=  group.write(requests);
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
index 75d234b0..aa4ce8c8 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
@@ -116,9 +116,12 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
                 .skip((currentPageNumber - 1) * pageMaxSize)
                 .limit(pageMaxSize)
                 .collect(Collectors.toList());
+        List<ProduceshiftorderDto> skipList = orderList.stream().skip((currentPageNumber - 1) * pageMaxSize)
+                .limit(pageMaxSize)
+                .collect(Collectors.toList());
         JSONObject jo = new JSONObject();
-        jo.put("content", orderList);
-        jo.put("totalElements", this.order.size());
+        jo.put("content", skipList);
+        jo.put("totalElements", orderList.size());
         return jo;
     }
 
@@ -147,7 +150,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
     @Override
     public ProduceshiftorderDto findByCode(String code) {
         WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder");
-        JSONObject json = wo.query("order_code ='" + code + "' and is_deleted = '0'","create_time").uniqueResult(0);
+        JSONObject json = wo.query("order_code ='" + code + "' and is_deleted = '0'", "create_time").uniqueResult(0);
         if (ObjectUtil.isEmpty(json)) {
             return null;
         }
@@ -450,7 +453,6 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
     }
 
 
-
     @Override
     public void addDeviceIsOnline(String device_code, ProduceshiftorderDto dto) {
         WQLObject wo = WQLObject.getWQLObject("acs_deviceisonline");
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 81619542..c8cc907f 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -171,12 +171,13 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
                             return true;
                         })
                         .sorted((task1, task2) -> DateUtil.compare(DateUtil.parseDate(task1.getCreate_time()), DateUtil.parse(task2.getCreate_time())))
-                        .skip((currentPageNumber - 1) * pageMaxSize)
-                        .limit(pageMaxSize)
                         .collect(Collectors.toList());
+        List<TaskDto> skipList = taskList.stream().skip((currentPageNumber - 1) * pageMaxSize)
+                .limit(pageMaxSize)
+                .collect(Collectors.toList());
         JSONObject jo = new JSONObject();
-        jo.put("content", taskList);
-        jo.put("totalElements", this.tasks.size());
+        jo.put("content", skipList);
+        jo.put("totalElements", taskList.size());
         return jo;
 
     }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql
index 47421336..4bb1d83e 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql
@@ -107,9 +107,7 @@ IF 输入.flag = "2"
             OR
             task.next_point_code LIKE CONCAT ( '%', 输入.point_code, '%')
             OR
-            task.start_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%' )
-            OR
-            task.next_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%')
+            task.put_point_code LIKE CONCAT ( '%', 输入.point_code, '%' )
             )
         ENDOPTION
         OPTION 输入.create_time <> ""