From 75e41319fd3f79c8d0b3e60ad84decd46dfb07d1 Mon Sep 17 00:00:00 2001
From: loujf <loujingfei666@163.com>
Date: Fri, 14 Oct 2022 16:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/sch/manage/buss/CallMaterialTask.java |  2 +-
 .../src/views/wms/database/material/index.vue | 32 +++++++++----------
 .../src/views/wms/pdm/produceTask/index.vue   |  8 ++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
index 893869a..71f8e8e 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
@@ -318,7 +318,7 @@ public class CallMaterialTask extends AbstractAcsTask {
             param.put("is_full", is_full);
             param.put("group_device", group_device);
             JSONObject outStructObj = StructFindUtil.getOutStruct(param);
-            if (ObjectUtil.isEmpty(outStructObj)) {
+            if (ObjectUtil.isEmpty(outStructObj) && !StrUtil.equals(ivt_workprocedure_id,WorkProcedureEnum.YZGX.getId())) {
                 //假如没有货，且下料位两个都为空下发acs动作信号
                 WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
                 WmsToAcsServiceImpl wmsToAcsService = new WmsToAcsServiceImpl();
diff --git a/wms/qd/src/views/wms/database/material/index.vue b/wms/qd/src/views/wms/database/material/index.vue
index 8fa0224..28e421f 100644
--- a/wms/qd/src/views/wms/database/material/index.vue
+++ b/wms/qd/src/views/wms/database/material/index.vue
@@ -10,17 +10,17 @@
         <rrOperation :crud="crud" />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" >
-      <el-button
-        slot="right"
-        class="filter-item"
-        type="info"
-        icon="el-icon-s-comment"
-        size="mini"
-        @click="is_sys"
-      >
-        同步
-      </el-button>
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="info"
+          icon="el-icon-s-comment"
+          size="mini"
+          @click="is_sys"
+        >
+          同步
+        </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="550px">
@@ -28,7 +28,7 @@
           <el-form-item label="物料编码" prop="material_code">
             <el-input v-model="form.material_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="物料名称" prop="material_name">
+          <el-form-item label="产品名称" prop="material_name">
             <el-input v-model="form.material_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="规格">
@@ -72,11 +72,11 @@
       <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="material_code" label="物料编码" />
-        <el-table-column prop="material_name" label="物料名称 " />
+        <el-table-column prop="material_name" label="产品名称 " />
         <el-table-column prop="material_spec" label="规格" />
         <el-table-column prop="material_model" label="型号" />
         <el-table-column prop="material_type" label="物料类型" />
-        <el-table-column prop="stewing_time" label="静止时间(分钟)" width="110" />
+        <el-table-column prop="stewing_time" label="静止时间(小时)" width="110" />
         <el-table-column prop="english_name" label="外文名称" />
         <el-table-column prop="create_name" label="创建人" />
         <el-table-column prop="create_time" label="创建时间" width="150" />
@@ -270,11 +270,11 @@ export default {
       console.log(value)
     },
     is_sys() {
-      crudMdMeMaterial.synchro({ producetask_id:'' }).then(res => {
+      crudMdMeMaterial.synchro({ producetask_id: '' }).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
-    },
+    }
   }
 }
 </script>
diff --git a/wms/qd/src/views/wms/pdm/produceTask/index.vue b/wms/qd/src/views/wms/pdm/produceTask/index.vue
index d5f98ca..af4fd30 100644
--- a/wms/qd/src/views/wms/pdm/produceTask/index.vue
+++ b/wms/qd/src/views/wms/pdm/produceTask/index.vue
@@ -182,10 +182,10 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="生产顺序" prop="seq_no">
-            <el-input-number v-model="form.seq_no" controls-position="right" style="width: 200px;text-align: left" :min="1" />
-            <!--            <el-input-number v-model="form.seq_no" :precision="0" :step="10" :min="0" style="width: 200px;" />-->
-          </el-form-item>
+<!--          <el-form-item label="生产顺序" prop="seq_no">-->
+<!--            <el-input-number v-model="form.seq_no" controls-position="right" style="width: 200px;text-align: left" :min="1" />-->
+<!--            &lt;!&ndash;            <el-input-number v-model="form.seq_no" :precision="0" :step="10" :min="0" style="width: 200px;" />&ndash;&gt;-->
+<!--          </el-form-item>-->
           <el-form-item v-if="false" label="静置时间" prop="stewing_time">
             <el-input v-model="form.stewing_time" :rows="3" style="width: 200px;" />
           </el-form-item>