pda入库绑定选择，手动出库确认选择，盘点任务完成账务处理优化

ruoyi-ui/src/api/in/bindTrayMsg.js

@@ -26,6 +26,15 @@ export function addBindTrayMsg(data) {
   })
 }
 
+// 新增入库信息
+export function addBindEmptyTrayMsg(data) {
+  return request({
+    url: '/pda/addEmptyTrayJob',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改入库信息
 export function updateBindTrayMsg(data) {
   return request({

ruoyi-ui/src/views/in/bindTrayMsg/index.vue

@@ -86,9 +86,19 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          @click="handleAdd"
+          @click="handleAdd('bindMsg')"
           v-hasPermi="['in:bindMsg:add']"
-        >新增</el-button>
+        >新增版辊绑定</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd('emptyTray')"
+          v-hasPermi="['in:bindMsg:add']"
+        >新增空托盘绑定</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -193,8 +203,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="版辊编号" prop="rollerNumber">
-              <el-input v-model="form.rollerNumber" placeholder="请输入版辊编号" />
+            <el-form-item label="物料编号" prop="rollerNumber">
+              <el-input v-model="form.rollerNumber" :disabled="isBindEmptyTray" placeholder="请输入版辊编号" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -213,7 +223,7 @@
 </template>
 
 <script>
-import { listBindTrayMsg, getBindTrayMsg, delBindTrayMsg, delBindTrayMsgByRollerNumber, addBindTrayMsg, updateBindTrayMsg } from "@/api/in/bindTrayMsg"
+import { listBindTrayMsg, getBindTrayMsg, delBindTrayMsgByRollerNumber, addBindTrayMsg, addBindEmptyTrayMsg } from "@/api/in/bindTrayMsg"
 import { data } from "vue-barcode";
 
 export default {
@@ -277,7 +287,9 @@ export default {
         id: [
           { required: true, message: "$comment不能为空", trigger: "blur" }
         ],
-      }
+      },
+
+      isBindEmptyTray: false
     }
   },
   created() {
@@ -355,10 +367,19 @@ export default {
     },
 
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(type) {
       this.reset()
       this.open = true
       this.title = "添加入库信息"
+
+      if (type === 'emptyTray') {
+      // 绑定空托盘逻辑
+      this.isBindEmptyTray = true;
+      this.form.rollerNumber = 'KTP0001'; // 默认值
+    } else {
+      // 普通版辊绑定逻辑
+      this.isBindEmptyTray = false;
+    }
     },
 
     /** 修改按钮操作 */
@@ -389,12 +410,20 @@ export default {
         rollerNumber: this.form.rollerNumber,
         quantity: this.form.quantity,
       }
-      
-      addBindTrayMsg(data).then(() => {
+
+      if (this.isBindEmptyTray) {
+        addBindEmptyTrayMsg(data).then(() => {
+          this.$modal.msgSuccess("新增成功")
+          this.open = false
+          this.getList()
+        }).catch(() => {})
+      } else {
+        addBindTrayMsg(data).then(() => {
         this.$modal.msgSuccess("新增成功")
         this.open = false
         this.getList()
-      }).catch(() => {})
+        }).catch(() => {})
+      }
          
     },
 

ruoyi-ui/src/views/pd/job/out/index.vue

@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="任务类型" prop="inOrOut">
+      <!-- <el-form-item label="任务类型" prop="inOrOut">
         <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
           <el-option
             v-for="dict in dict.type.mydo_job_status"
@@ -18,7 +18,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="执行阶段" prop="executionPhase">
         <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
           <el-option
@@ -106,11 +106,11 @@
       <el-table-column label="任务ID" align="center" prop="jobId" />
       <el-table-column label="任务状态" align="center" prop="status" />
       <el-table-column label="任务号" align="center" prop="taskNo" />
-      <el-table-column label="任务类型" align="center" prop="inOrOut">
+      <!-- <el-table-column label="任务类型" align="center" prop="inOrOut">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.inOrOut"/>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="执行阶段" align="center" prop="executionPhase">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_execution_phase" :value="scope.row.executionPhase"/>