refactor(入库计划): rfid校验，增加本地表单数据校验

src/components/itemSelect/singleBase.vue

@@ -140,7 +140,7 @@ export default {
         itemCode: undefined,
         itemName: undefined,
         itemTypeId: 0,
-        itemOrProduct: "ITEM"
+        itemOrProduct: ""
       },
       // 列信息
       columns: [

src/utils/request.js

@@ -22,7 +22,7 @@ const service = axios.create({
 
 const serviceWcs = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: "http://192.168.8.60:1880",
+  baseURL: "/wcs",
   // 超时
   timeout: 30000
 })

src/views/md/PLAN/index.vue

@@ -171,9 +171,9 @@
     <!-- 添加或修改出库计划管理对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="60%">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="计划编号" prop="planCode">
-          <el-input v-model="form.planCode" placeholder="请输入计划编号" :readonly="title == '修改出库计划管理'"/>
-        </el-form-item>
+<!--        <el-form-item label="计划编号" prop="planCode">-->
+<!--          <el-input v-model="form.planCode" placeholder="请输入计划编号" :readonly="title == '修改出库计划管理'"/>-->
+<!--        </el-form-item>-->
         <el-form-item label="出库类型" prop="wmsBusinessTypeId">
           <el-select v-model="form.wmsBusinessTypeId" placeholder="请选择出库类型">
             <el-option
@@ -194,16 +194,16 @@
         <!--            ></el-option>-->
         <!--          </el-select>-->
         <!--        </el-form-item>-->
-        <el-form-item label="计划类型" prop="planType">
-          <el-select v-model="form.planType" placeholder="请选择计划类型">
-            <el-option
-              v-for="dict in dict.type.plan_source_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="计划类型" prop="planType">-->
+<!--          <el-select v-model="form.planType" placeholder="请选择计划类型">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.plan_source_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="领用人" prop="recipientUsername">
           <el-input v-model="form.recipientUsername" placeholder="请输入领用人"/>
         </el-form-item>
@@ -257,20 +257,20 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="库位编码" prop="wmStorageAreaCode" min-width="150">
-            <template slot-scope="scope">
-              <!--              <el-input v-model="scope.row.wmStorageAreaCode" placeholder="请输入库位编码"/>-->
-              <el-input v-model="scope.row.wmStorageAreaCode" readonly="readonly" placeholder="请输入库位编码">
-                <el-button slot="append" @click="handleSelecArea(scope.row.index)"
-                           icon="el-icon-search"></el-button>
-              </el-input>
-            </template>
-          </el-table-column>
-          <el-table-column label="库位名称" prop="wmStorageAreaName" min-width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.wmStorageAreaName" readonly="readonly" placeholder="请输入库位名称"/>
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="库位编码" prop="wmStorageAreaCode" min-width="150">-->
+<!--            <template slot-scope="scope">-->
+<!--              &lt;!&ndash;              <el-input v-model="scope.row.wmStorageAreaCode" placeholder="请输入库位编码"/>&ndash;&gt;-->
+<!--              <el-input v-model="scope.row.wmStorageAreaCode" readonly="readonly" placeholder="请输入库位编码">-->
+<!--                <el-button slot="append" @click="handleSelecArea(scope.row.index)"-->
+<!--                           icon="el-icon-search"></el-button>-->
+<!--              </el-input>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="库位名称" prop="wmStorageAreaName" min-width="150">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input v-model="scope.row.wmStorageAreaName" readonly="readonly" placeholder="请输入库位名称"/>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <!--          <el-table-column label="明细状态" prop="detailState" width="150">-->
           <!--            <template slot-scope="scope">-->
           <!--              <el-select v-model="scope.row.detailState" placeholder="请选择明细状态">-->
@@ -323,16 +323,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="计划类型" prop="planType">
-          <el-select v-model="form.planType" placeholder="请选择计划类型" readonly="readonly" disabled>
-            <el-option
-              v-for="dict in dict.type.plan_source_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="计划类型" prop="planType">-->
+<!--          <el-select v-model="form.planType" placeholder="请选择计划类型" readonly="readonly" disabled>-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.plan_source_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="领用人" prop="recipientUsername">
           <el-input v-model="form.recipientUsername" placeholder="请输入领用人" readonly="readonly"/>
         </el-form-item>
@@ -370,19 +370,19 @@
               <el-input v-model="scope.row.detailBatchNum" placeholder="请输入明细批次" readonly="readonly"/>
             </template>
           </el-table-column>
-          <el-table-column label="库位编码" prop="wmStorageAreaCode" min-width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.wmStorageAreaCode" readonly="readonly" placeholder="请输入库位编码">
-                <el-button slot="append" @click="handleSelecArea(scope.row.index)"
-                           icon="el-icon-search"></el-button>
-              </el-input>
-            </template>
-          </el-table-column>
-          <el-table-column label="库位名称" prop="wmStorageAreaName" min-width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.wmStorageAreaName" readonly="readonly" placeholder="请输入库位名称"/>
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="库位编码" prop="wmStorageAreaCode" min-width="150">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input v-model="scope.row.wmStorageAreaCode" readonly="readonly" placeholder="请输入库位编码">-->
+<!--                <el-button slot="append" @click="handleSelecArea(scope.row.index)"-->
+<!--                           icon="el-icon-search"></el-button>-->
+<!--              </el-input>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="库位名称" prop="wmStorageAreaName" min-width="150">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input v-model="scope.row.wmStorageAreaName" readonly="readonly" placeholder="请输入库位名称"/>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column label="明细状态" prop="detailState" width="150">
             <template slot-scope="scope">
               <el-select v-model="scope.row.detailState" placeholder="请选择明细状态" readonly="readonly" disabled>
@@ -454,6 +454,7 @@ export default {
       // 表单参数
       form: {
         planState: '0',
+        planType: 'SGLR',
       },
       // 表单校验
       rules: {
@@ -497,7 +498,7 @@ export default {
         planCode: null,
         wmsBusinessTypeId: null,
         planState: '0',
-        planType: null,
+        planType: "SGLR",
         recipientUsername: null,
         remark: null,
         attr1: null,
@@ -612,7 +613,7 @@ export default {
         if (valid) {
           let sign = true;
           this.wmsOutPlanDetailList.forEach(item => {
-            if (!item.mdItemId || !item.wmStorageAreaId || !item.plannedQuantity || !item.detailState) {
+            if (!item.mdItemId || !item.plannedQuantity || !item.detailState) {
               this.$modal.msgWarning("请将出库计划明细信息填写完整后保存");
               sign = false;
             }

src/views/md/ROUTE/index.vue

@@ -33,8 +33,8 @@
 <!--            @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="是否默认" prop="isDefault">
-        <el-select v-model="queryParams.isDefault" placeholder="请选择是否默认" clearable>
+      <el-form-item label="是否有效" prop="isDefault">
+        <el-select v-model="queryParams.isDefault" placeholder="请选择是否有效" clearable>
           <el-option
               v-for="dict in dict.type.yes_or_no"
               :key="dict.value"
@@ -106,7 +106,7 @@
       <el-table-column label="BOM名称" align="center" prop="bomName"/>
       <el-table-column label="BOM版本" align="center" prop="bomVersion"/>
 <!--      <el-table-column label="所属物料" align="center" prop="mdItemId"/>-->
-      <el-table-column label="是否默认" align="center" prop="isDefault">
+      <el-table-column label="是否有效" align="center" prop="isDefault">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yes_or_no" :value="scope.row.isDefault"/>
         </template>
@@ -181,8 +181,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="是否默认" prop="isDefault">
-          <el-select v-model="form.isDefault" placeholder="请选择是否默认">
+        <el-form-item label="是否有效" prop="isDefault">
+          <el-select v-model="form.isDefault" placeholder="请选择是否有效">
             <el-option
                 v-for="dict in dict.type.yes_or_no"
                 :key="dict.value"
@@ -320,7 +320,7 @@ export default {
           {required: true, message: "物料编码不能为空", trigger: "blur"}
         ],
         isDefault: [
-          {required: true, message: "是否默认不能为空", trigger: "change"}
+          {required: true, message: "是否有效不能为空", trigger: "change"}
         ],
       },
       nowChildItemIndex: null

src/views/mes/md/inventoryBatch/index.vue

@@ -52,7 +52,7 @@
             type="text"
             @click="handleLook(scope.row)"
             v-hasPermi="['md:TASK:edit']"
-          >查看物料清单
+          >查看明细
           </el-button>
         </template>
       </el-table-column>
@@ -66,84 +66,18 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改出库任务对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="出库计划ID" prop="wmsOutPlanId">
-          <el-input v-model="form.wmsOutPlanId" placeholder="请输入出库计划ID"/>
-        </el-form-item>
-        <el-form-item label="出库计划编码" prop="wmsOutPlanCode">
-          <el-input v-model="form.wmsOutPlanCode" placeholder="请输入出库计划编码"/>
-        </el-form-item>
-        <el-form-item label="出库计划明细ID" prop="wmsOutPlanDetailId">
-          <el-input v-model="form.wmsOutPlanDetailId" placeholder="请输入出库计划明细ID"/>
-        </el-form-item>
-        <el-form-item label="出库类型ID" prop="wmsBusinessTypeId">
-          <el-input v-model="form.wmsBusinessTypeId" placeholder="请输入出库类型ID"/>
-        </el-form-item>
-        <el-form-item label="任务编码" prop="taskCode">
-          <el-input v-model="form.taskCode" placeholder="请输入任务编码"/>
-        </el-form-item>
-        <el-form-item label="任务数量" prop="taskNumber">
-          <el-input v-model="form.taskNumber" placeholder="请输入任务数量"/>
-        </el-form-item>
-        <el-form-item label="出库数量" prop="outNumber">
-          <el-input v-model="form.outNumber" placeholder="请输入出库数量"/>
-        </el-form-item>
-        <el-form-item label="目标库位ID" prop="wmStorageAreaId">
-          <el-input v-model="form.wmStorageAreaId" placeholder="请输入目标库位ID"/>
-        </el-form-item>
-        <el-form-item label="批次" prop="batchNum">
-          <el-input v-model="form.batchNum" placeholder="请输入批次"/>
-        </el-form-item>
-        <el-form-item label="物料ID" prop="mdItemId">
-          <el-input v-model="form.mdItemId" placeholder="请输入物料ID"/>
-        </el-form-item>
-        <el-form-item label="物料编码" prop="mdItemCode">
-          <el-input v-model="form.mdItemCode" placeholder="请输入物料编码"/>
-        </el-form-item>
-        <el-form-item label="物料名称" prop="mdItemName">
-          <el-input v-model="form.mdItemName" placeholder="请输入物料名称"/>
-        </el-form-item>
-        <el-form-item label="物料单位" prop="mdItemUnit">
-          <el-input v-model="form.mdItemUnit" placeholder="请输入物料单位"/>
-        </el-form-item>
-        <el-form-item label="任务状态" prop="taskState">
-          <el-select v-model="form.taskState" placeholder="请选择任务状态">
-            <el-option
-              v-for="dict in dict.type.in_plan_state"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="领料人" prop="recipientUsername">
-          <el-input v-model="form.recipientUsername" placeholder="请输入领料人"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :close-on-click-modal="false" title="出库物品清单" :visible.sync="openLook" width="60%" append-to-body>
-      <el-table :data="outInfoList" >
-        <el-table-column label="计划状态" align="center" prop="planStatus" :show-overflow-tooltip="true"/>
-        <el-table-column label="计划类型" align="center" prop="planType" :show-overflow-tooltip="true"/>
-        <el-table-column label="出库类型编码" align="center" prop="planTypeCode" :show-overflow-tooltip="true"/>
-        <el-table-column label="出库类型名称" align="center" prop="planTypeName" :show-overflow-tooltip="true"/>
-        <el-table-column label="明细批次" align="center" prop="detailBatchNum" :show-overflow-tooltip="true"/>
+    <el-dialog :close-on-click-modal="false" title="批次台账明细" :visible.sync="openLook" width="60%" append-to-body>
+      <el-table :data="infoList" >
         <el-table-column label="台账ID" align="center" prop="baseKnifeId" :show-overflow-tooltip="true"/>
-        <el-table-column label="物料编码" align="center" prop="mdItemCode" :show-overflow-tooltip="true"/>
+        <el-table-column label="库房" align="center" prop="wmWarehouseName" :show-overflow-tooltip="true"/>
+        <el-table-column label="库位" align="center" prop="wmStorageAreaName" :show-overflow-tooltip="true"/>
+        <el-table-column label="明细批次" align="center" prop="detailBatchNum" :show-overflow-tooltip="true"/>
         <el-table-column label="物料名称" align="center" prop="mdItemName" :show-overflow-tooltip="true"/>
-        <el-table-column label="库位编码" align="center" prop="wmStorageAreaCode" :show-overflow-tooltip="true"/>
-        <el-table-column label="库位名称" align="center" prop="wmStorageAreaName" :show-overflow-tooltip="true"/>
-        <el-table-column label="当时寿命%" align="center" prop="knifeLife" :show-overflow-tooltip="true"/>
+        <el-table-column label="物料编码" align="center" prop="mdItemCode" :show-overflow-tooltip="true"/>
+        <el-table-column label="单位" align="center" prop="mdItemUnit" :show-overflow-tooltip="true"/>
+        <el-table-column label="业务类型" align="center" prop="planTypeName" :show-overflow-tooltip="true"/>
+        <el-table-column label="业务编码" align="center" prop="planCode" :show-overflow-tooltip="true"/>
+        <el-table-column label="出/入库时间" align="center" prop="dateTime" :show-overflow-tooltip="true"/>
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button @click="openLook = false">关 闭</el-button>
@@ -155,7 +89,6 @@
 <script>
 import {listTASK, getTASK, delTASK, addTASK, updateTASK, runTASK, autoRunTASK} from "@/api/md/TASK";
 import {listInventoryBatch} from "@/api/mes/md/inventoryBatch"
-import {rgb} from "chalk";
 
 export default {
   name: "TASK",
@@ -210,7 +143,7 @@ export default {
       // 表单校验
       rules: {},
       openLook: false,
-      outInfoList: []
+      infoList: []
     };
   },
   created() {
@@ -316,12 +249,9 @@ export default {
     },
     /** 查看按钮操作 */
     handleLook(row) {
-      const wmsOutTaskIds = row.wmsOutTaskId || this.ids;
-      getTASK(wmsOutTaskIds).then(response => {
-        this.openLook = true;
-        this.outInfoList = []
-        this.outInfoList = response.data.outInfoList;
-      });
+      this.openLook = true;
+      this.infoList = []
+      this.infoList = row.infoList;
     },
     /** 执行按钮操作 */
     handleRun(row) {

src/views/mes/md/mditem/index.vue

@@ -222,10 +222,22 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="物料名称" prop="itemName">
-                  <el-input v-model="form.itemName" maxlength="255" readonly="readonly" v-if="optType=='view'"/>
-                  <el-input v-model="form.itemName" placeholder="请输入物料名称" maxlength="255" v-else/>
-                </el-form-item>
+                <el-col :span="16">
+                  <el-form-item label="物料名称" prop="itemName">
+                    <el-input v-model="form.itemName" maxlength="255" readonly="readonly" v-if="optType=='view'"/>
+                    <el-input v-model="form.itemName" placeholder="请输入物料名称" maxlength="255" v-else/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label-width="80">
+                    <el-switch v-model="form.attr3"
+                               active-color="#13ce66"
+                               active-text="大号物料"
+                               :active-value="1"
+                               :inactive-value="0">
+                    </el-switch>
+                  </el-form-item>
+                </el-col>
               </el-col>
             </el-row>
             <el-row>
@@ -291,35 +303,6 @@
           </el-col>
         </el-row>
         <el-row>
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="标准数量" prop="standardNumber">-->
-<!--              <el-input-number v-model="form.standardNumber" :min="0" :percision="0" :step="1" disabled-->
-<!--                               v-if="optType=='view'"/>-->
-<!--              <el-input-number v-model="form.standardNumber" :min="0" :percision="0" :step="1"-->
-<!--                               placeholder="请输入标准数量"-->
-<!--                               v-else/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-          <el-col :span="12" v-if="resentEnable">
-            <el-form-item label="刀刃数" prop="attr1">
-              <el-input-number v-model="form.attr1" :min="1" :percision="0" :step="1" disabled
-                               v-if="optType=='view'"/>
-              <el-input-number v-model="form.attr1" :min="1" :percision="0" :step="1"
-                               placeholder="请输入刀刃数"
-                               v-else/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="预警阈值" prop="attr2" v-if="this.warnEnable">
-              <el-input-number v-model="form.attr2" :min="0" :percision="0" :step="1" disabled
-                               v-if="optType=='view'"/>
-              <el-input-number v-model="form.attr2" :min="0" :percision="0" :step="1"
-                               placeholder="请输入预警阈值"
-                               v-else/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="是否启用">
               <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
@@ -349,44 +332,7 @@
                                v-else/>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="安全库存">-->
-          <!--              <el-radio-group v-model="form.safeStockFlag" disabled v-if="optType=='view'">-->
-          <!--                <el-radio-->
-          <!--                  v-for="dict in dict.type.sys_yes_no"-->
-          <!--                  :key="dict.value"-->
-          <!--                  :label="dict.value"-->
-          <!--                >{{ dict.label }}-->
-          <!--                </el-radio>-->
-          <!--              </el-radio-group>-->
-
-          <!--              <el-radio-group v-model="form.safeStockFlag" v-else>-->
-          <!--                <el-radio-->
-          <!--                  v-for="dict in dict.type.sys_yes_no"-->
-          <!--                  :key="dict.value"-->
-          <!--                  :label="dict.value"-->
-          <!--                >{{ dict.label }}-->
-          <!--                </el-radio>-->
-          <!--              </el-radio-group>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
         </el-row>
-        <!--        <el-row v-if="form.safeStockFlag == 'Y'">-->
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="最小库存量">-->
-        <!--              <el-input-number v-model="form.minStock" :percision="2" :step="1" disabled v-if="optType=='view'"/>-->
-        <!--              <el-input-number v-model="form.minStock" :percision="2" :step="1" placeholder="请输入最小安全库存量"-->
-        <!--                               v-else/>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="最大库存量">-->
-        <!--              <el-input-number v-model="form.maxStock" :percision="2" :step="1" disabled v-if="optType=='view'"/>-->
-        <!--              <el-input-number v-model="form.maxStock" :percision="2" :step="1" placeholder="请输入最大安全库存量"-->
-        <!--                               v-else/>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
@@ -396,19 +342,6 @@
           </el-col>
         </el-row>
       </el-form>
-      <!--      <el-tabs type="border-card" v-if="form.itemId != null">-->
-      <!--        <el-tab-pane label="BOM组成">-->
-      <!--          <ItemBom :optType="optType" :itemId="form.itemId"></ItemBom>-->
-      <!--        </el-tab-pane>-->
-      <!--        <el-tab-pane label="供应商"></el-tab-pane>-->
-      <!--        <el-tab-pane label="替代品"></el-tab-pane>-->
-      <!--        <el-tab-pane label="SIP">-->
-      <!--          <SIPTab :itemId="form.itemId" :optType="optType"></SIPTab>-->
-      <!--        </el-tab-pane>-->
-      <!--        <el-tab-pane label="SOP">-->
-      <!--          <SOPTab :itemId="form.itemId" :optType="optType"></SOPTab>-->
-      <!--        </el-tab-pane>-->
-      <!--      </el-tabs>-->
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
@@ -575,25 +508,6 @@ export default {
     itemTypeName(val) {
       this.$refs.tree.filter(val);
     },
-    'form.itemTypeId': function (val) {
-      if (val != undefined)
-        getItemType(val).then(response => {
-          if (response.data.itemOrProduct == "BLADE") {
-            this.resentEnable = true
-            // this.form.attr1 = '0'
-          } else {
-            this.resentEnable = false
-            this.form.attr1 = '0'
-          }
-
-          if (response.data.itemOrProduct == "PRODUCT") {
-            this.warnEnable = true
-          } else {
-            this.warnEnable = false
-            this.form.attr2 = '0'
-          }
-        })
-    }
   },
   created() {
     this.getList();

src/views/mes/wm/area/index.vue

@@ -78,7 +78,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:wm:area:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -89,7 +90,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:wm:area:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -100,28 +102,30 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:wm:area:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="库位编码" align="center" prop="areaCode" >
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="库位编码" align="center" prop="areaCode">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:wm:area:query']"
-          >{{scope.row.areaCode}}</el-button>
+          >{{ scope.row.areaCode }}
+          </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="库位名称" align="center" prop="areaName" />
-      <el-table-column label="所属库区" align="center" prop="locationName" />
-      <el-table-column label="上级库位" align="center" prop="superiorName" />
-      <el-table-column label="X" align="center" prop="positionX" />
-      <el-table-column label="y" align="center" prop="positionY" />
-      <el-table-column label="z" align="center" prop="positionZ" />
+      <el-table-column label="库位名称" align="center" prop="areaName"/>
+      <el-table-column label="所属库区" align="center" prop="locationName"/>
+      <el-table-column label="上级库位" align="center" prop="superiorName"/>
+      <el-table-column label="X" align="center" prop="positionX"/>
+      <el-table-column label="y" align="center" prop="positionY"/>
+      <el-table-column label="z" align="center" prop="positionZ"/>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -131,14 +135,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:wm:area:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:wm:area:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -163,7 +169,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item  label-width="80">
+                <el-form-item label-width="80">
                   <el-switch v-model="autoGenFlag"
                              active-color="#13ce66"
                              active-text="自动生成"
@@ -174,21 +180,45 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="库位名称" prop="areaName">
-                  <el-input v-model="form.areaName" placeholder="请输入库位名称" />
-                </el-form-item>
+                <el-col :span="16">
+                  <el-form-item label="库位名称" prop="areaName">
+                    <el-input v-model="form.areaName" placeholder="请输入库位名称"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label-width="80">
+                    <el-switch v-model="form.attr3"
+                               active-color="#13ce66"
+                               active-text="大号库位"
+                               :active-value="1"
+                               :inactive-value="0">
+                    </el-switch>
+                  </el-form-item>
+                </el-col>
               </el-col>
               <el-col :span="24">
                 <div style="display: flex">
                   <el-form-item label="库区" prop="locationId">
                     <div style="display: flex">
-                      <el-input v-model="form.locationName" placeholder="请选择库区名称" />
+                      <el-input v-model="form.locationName" placeholder="请选择库区名称"/>
                       <el-button @click="selecocationVisible=true" icon="el-icon-search"></el-button>
                     </div>
                   </el-form-item>
                 </div>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="是否禁用">
+                  <el-switch v-model="form.attr4"
+                             active-color="#13ce66"
+                             active-text="禁用"
+                             :active-value="1"
+                             :inactive-value="0">
+                  </el-switch>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <!--              <el-col :span="24">-->
               <!--                <div style="display: flex">-->
@@ -206,24 +236,24 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="库位位置X" prop="positionX">
-              <el-input-number :min="0" :step="1" v-model="form.positionX" placeholder="请输入库位位置X" />
+              <el-input-number :min="0" :step="1" v-model="form.positionX" placeholder="请输入库位位置X"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="库位位置y" prop="positionY">
-              <el-input-number :min="0" :step="1" v-model="form.positionY" placeholder="请输入库位位置y" />
+              <el-input-number :min="0" :step="1" v-model="form.positionY" placeholder="请输入库位位置y"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="库位位置z" prop="positionZ">
-              <el-input-number :min="0" :step="1" v-model="form.positionZ" placeholder="请输入库位位置z" />
+              <el-input-number :min="0" :step="1" v-model="form.positionZ" placeholder="请输入库位位置z"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -255,15 +285,15 @@ import SelecAreaCmps from "@/components/wm/SelecAreaCmps.vue";
 export default {
   name: "Area",
   dicts: ['sys_yes_no'],
-  components: {SelecLocationCmps, BarcodeImg,SelecAreaCmps } ,
+  components: {SelecLocationCmps, BarcodeImg, SelecAreaCmps},
   data() {
     return {
       //库位选择
-      selecareaVisible:false,
+      selecareaVisible: false,
       //库区选择
-      selecocationVisible:false,
+      selecocationVisible: false,
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag: false,
       optType: undefined,
       locationId: undefined,
       // 遮罩层
@@ -302,16 +332,16 @@ export default {
       // 表单校验
       rules: {
         areaCode: [
-          { required: true, message: "库位编码不能为空", trigger: "blur" }
+          {required: true, message: "库位编码不能为空", trigger: "blur"}
         ],
         areaName: [
-          { required: true, message: "库位名称不能为空", trigger: "blur" }
+          {required: true, message: "库位名称不能为空", trigger: "blur"}
         ],
         locationId: [
-          { required: true, message: "库区不能为空", trigger: "blur" }
+          {required: true, message: "库区不能为空", trigger: "blur"}
         ],
         attr1: [
-          { required: true, message: "上级库位名称不能为空", trigger: "blur" }
+          {required: true, message: "上级库位名称不能为空", trigger: "blur"}
         ]
       }
     };
@@ -389,7 +419,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.areaId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -400,7 +430,7 @@ export default {
       this.optType = "add";
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
       const areaId = row.areaId || this.ids
       getArea(areaId).then(response => {
@@ -445,25 +475,26 @@ export default {
      * 冻结状态变更
      * @param row
      */
-    handleFrozenChange(row){
+    handleFrozenChange(row) {
       let text = row.frozenFlag === "Y" ? "冻结" : "解冻";
-      this.$modal.confirm('确认要"' + text + '""' + row.areaName + '"库位吗？').then(function() {
-        return changeFrozenState(row.areaId,row.frozenFlag);
+      this.$modal.confirm('确认要"' + text + '""' + row.areaName + '"库位吗？').then(function () {
+        return changeFrozenState(row.areaId, row.frozenFlag);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
+      }).catch(function () {
         row.frozenFlag = row.frozenFlag === "N" ? "Y" : "N";
       });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       const areaIds = row.areaId || this.ids;
-      this.$modal.confirm('是否确认删除库位设置编号为"' + areaIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除库位设置编号为"' + areaIds + '"的数据项？').then(function () {
         return delArea(areaIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -472,12 +503,12 @@ export default {
       }, `area_${new Date().getTime()}.xlsx`)
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('AREA_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode('AREA_CODE').then(response => {
           this.form.areaCode = response;
         });
-      }else{
+      } else {
         this.form.areaCode = null;
       }
     }

src/views/mes/wm/ctBase/index.vue

@@ -139,9 +139,21 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="料箱编码" prop="code">
-              <el-input v-model="form.code" placeholder="请输入料箱编码"/>
-            </el-form-item>
+            <el-col :span="16">
+              <el-form-item label="料箱编码" prop="code">
+                <el-input v-model="form.code" placeholder="请输入料箱编码"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label-width="80">
+                <el-switch v-model="form.attr3"
+                           active-color="#13ce66"
+                           active-text="大号料箱"
+                           :active-value="1"
+                           :inactive-value="0">
+                </el-switch>
+              </el-form-item>
+            </el-col>
           </el-col>
         </el-row>
         <el-row>

src/views/mes/wm/inPlan/index.vue

@@ -24,53 +24,22 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          @click="handleAdd"
-          v-hasPermi="['wm:PLAN:add']"
-        >新增
+          @click="handleAdd('CGRK')"
+        >采购入库
         </el-button>
-        <!--        <el-button-->
-        <!--          type="primary"-->
-        <!--          plain-->
-        <!--          icon="el-icon-plus"-->
-        <!--          size="mini"-->
-        <!--          @click="knifeBackVisible=true"-->
-        <!--        >整刀回库-->
-        <!--        </el-button>-->
       </el-col>
       <el-col :span="1.5">
-        <!--        <el-button-->
-        <!--            type="success"-->
-        <!--            plain-->
-        <!--            icon="el-icon-edit"-->
-        <!--            size="mini"-->
-        <!--            :disabled="single"-->
-        <!--            @click="handleUpdate"-->
-        <!--            v-hasPermi="['wm:PLAN:edit']"-->
-        <!--        >修改-->
-        <!--        </el-button>-->
-        <!--      </el-col>-->
-        <!--      <el-col :span="1.5">-->
-        <!--        <el-button-->
-        <!--            type="danger"-->
-        <!--            plain-->
-        <!--            icon="el-icon-delete"-->
-        <!--            size="mini"-->
-        <!--            :disabled="multiple"-->
-        <!--            @click="handleDelete"-->
-        <!--            v-hasPermi="['wm:PLAN:remove']"-->
-        <!--        >删除-->
-        <!--        </el-button>-->
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd('GJHK')"
+        >工具回库
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <!--        <el-button-->
-        <!--            type="warning"-->
-        <!--            plain-->
-        <!--            icon="el-icon-download"-->
-        <!--            size="mini"-->
-        <!--            @click="handleExport"-->
-        <!--            v-hasPermi="['wm:PLAN:export']"-->
-        <!--        >导出-->
-        <!--        </el-button>-->
+
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -81,7 +50,7 @@
       <el-table-column label="计划编码" align="center" prop="planCode"/>
       <el-table-column label="入库类型" align="center" prop="planTypeId">
         <template slot-scope="scope">
-          {{ filterInPlanType(scope.row.planTypeId) }}
+          {{ filterInPlanType(scope.row.planTypeCode) }}
         </template>
       </el-table-column>
       <el-table-column label="计划类型" align="center" prop="sourceType">
@@ -145,122 +114,115 @@
     />
 
     <!-- 添加或修改入库计划对话框 -->
-    <div v-if="!isKnifeBack">
-      <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body :close-on-click-modal="false">
-        <!--状态为1已执行 则禁用-->
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline :disabled="form.state === '1'">
-          <el-form-item label="计划编码" prop="planCode">
-            <el-input v-model="form.planCode" placeholder="请输入计划编码"></el-input>
-          </el-form-item>
-          <el-form-item label="入库类型" prop="planTypeId">
-            <el-select v-model="form.planTypeId" placeholder="请选择入库类型" @change="handlePlanTypeSelectChange">
-              <el-option :label="item.name" :value="item.typeId" v-for="item in inPlanTypeList"
-                         :key="item.typeId"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="源头单据" prop="relBillCode">
-            <el-input v-model="form.relBillCode" placeholder="请输入源头单据"></el-input>
-          </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
-          </el-form-item>
-          <el-divider content-position="center">入库计划明细信息</el-divider>
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddWmsInPlanDetails">添加
-              </el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteWmsInPlanDetails">删除
-              </el-button>
-            </el-col>
-          </el-row>
-          <div>
-            <el-table :data="wmsInPlanDetailsList" :row-class-name="rowWmsInPlanDetailsIndex"
-                      @selection-change="handleWmsInPlanDetailsSelectionChange" ref="wmsInPlanDetails"
-                      :highlight-current-row="isKnifeBack" @current-change="handleWmsInPlanDetailsCurrentChange">
-              <el-table-column type="selection" width="55" align="center"/>
-              <el-table-column label="序号" align="center" prop="index" width="50"/>
-              <el-table-column label="物品" prop="materialId" width="170">
-                <template slot-scope="scope">
-                  <el-select v-model="scope.row.materialId" placeholder="请选择物料" filterable remote
-                             :remote-method="getMdItemList" clearable>
-                    <el-option :label="item.itemName" :value="item.itemId.toString()" v-for="item in mdItemList"
-                               :key="item.itemId">
-                      <span style="float: left">{{ item.itemName }}</span>
-                      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.itemCode }}</span>
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="批次" prop="batch" width="150">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.batch" plcaeholder="请输入批次"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column label="计划数量" prop="quantity" width="150">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.quantity" plcaeholder="请输入计划数量" type="number" :min="0"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column label="入库数量" prop="quantityIn" width="150">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.quantityIn" plcaeholder="请输入入库数量" type="number" :min="0"
-                            @change="handleQuantityIn($event,scope.row)" :disabled="isKnifeBack"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column label="库位" prop="cellId" width="150">
-                <template slot-scope="scope">
-                  <el-select v-model="scope.row.cellId" placeholder="请选择库位" filterable remote
-                             :remote-method="getMdItemList" clearable>
-                    <el-option :label="item.areaName" :value="item.areaId.toString()" v-for="item in areaList"
-                               :key="item.areaId">
-                      <span style="float: left">{{ item.areaName }}</span>
-                      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.areaCode }}</span>
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="状态" prop="planInStatus" width="150">
-                <dict-tag :options="dict.type.in_plan_state" :value="form.state"></dict-tag>
-              </el-table-column>
-            </el-table>
-          </div>
-          <!--入库类型为整刀回库则显示-->
-          <!--        <div v-if="isKnifeBack && Object.keys(selectPlanDetail).length > 0">-->
-          <!--          <el-divider content-position="center">整刀实例</el-divider>-->
-          <!--          <wms-in-plan-detail-entity-table-cmps-->
-          <!--            :planDetail="wmsInPlanDetailsList[selectPlanDetail.index-1]"-->
-          <!--            :entityList.sync="wmsInPlanDetailsList[selectPlanDetail.index-1].wmsInPlanDetailEntityList"-->
-          <!--            @count="wmsInPlanDetailsList[selectPlanDetail.index-1].quantityIn = $event"-->
-          <!--          ></wms-in-plan-detail-entity-table-cmps>-->
-          <!--        </div>-->
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+    <el-dialog :title="dialogTitle" :visible.sync="open" width="50%" append-to-body :close-on-click-modal="false">
+      <!--状态为 1 已执行 则禁用表单-->
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline :disabled="form.state === '1'">
+        <!--        <el-form-item label="计划编码" prop="planCode">-->
+        <!--          <el-input v-model="form.planCode" placeholder="请输入计划编码"></el-input>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="源头单据" prop="relBillCode">
+          <el-input v-model="form.relBillCode" placeholder="请输入源头单据"></el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
+        </el-form-item>
+        <el-divider content-position="center">入库计划明细信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddWmsInPlanDetails">添加
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteWmsInPlanDetails">删除
+            </el-button>
+          </el-col>
+        </el-row>
+        <div>
+          <el-table :data="wmsInPlanDetailsList" :row-class-name="rowWmsInPlanDetailsIndex"
+                    @selection-change="handleWmsInPlanDetailsSelectionChange" ref="wmsInPlanDetails"
+                    @current-change="handleWmsInPlanDetailsCurrentChange">
+            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column label="序号" align="center" prop="index" width="50"/>
+            <el-table-column label="物品" prop="materialId" width="170">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.materialId" placeholder="请选择物料" filterable remote
+                           :remote-method="getMdItemList" clearable>
+                  <el-option :label="item.itemName" :value="item.itemId.toString()" v-for="item in mdItemList"
+                             :key="item.itemId">
+                    <span style="float: left">{{ item.itemName }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.itemCode }}</span>
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="批次" prop="batch" width="150">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.batch" plcaeholder="请输入批次"></el-input>
+              </template>
+            </el-table-column>
+            <!--            <el-table-column label="计划数量" prop="quantity" width="150">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <el-input v-model="scope.row.quantity" plcaeholder="请输入计划数量" type="number" :min="0"></el-input>-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
+            <el-table-column label="入库数量" prop="quantityIn" width="150">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.quantityIn" plcaeholder="请输入入库数量" type="number" :min="0"
+                          @change="handleQuantityIn($event,scope.row)"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="库位" prop="cellId" width="190">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.cellId" placeholder="请选择库位" filterable remote
+                           :remote-method="getMdItemList" clearable>
+                  <el-option :label="item.areaName" :value="item.areaId.toString()" v-for="item in areaList"
+                             :key="item.areaId">
+                    <span style="float: left">{{ item.areaName }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.areaCode }}</span>
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" prop="planInStatus" width="150">
+              <dict-tag :options="dict.type.in_plan_state" :value="form.state"></dict-tag>
+            </el-table-column>
+          </el-table>
         </div>
-      </el-dialog>
-    </div>
+        <!--入库类型为整刀回库则显示-->
+        <!--        <div v-if="isKnifeBack && Object.keys(selectPlanDetail).length > 0">-->
+        <!--          <el-divider content-position="center">整刀实例</el-divider>-->
+        <!--          <wms-in-plan-detail-entity-table-cmps-->
+        <!--            :planDetail="wmsInPlanDetailsList[selectPlanDetail.index-1]"-->
+        <!--            :entityList.sync="wmsInPlanDetailsList[selectPlanDetail.index-1].wmsInPlanDetailEntityList"-->
+        <!--            @count="wmsInPlanDetailsList[selectPlanDetail.index-1].quantityIn = $event"-->
+        <!--          ></wms-in-plan-detail-entity-table-cmps>-->
+        <!--        </div>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
 
     <!-- 添加或修改入库计划对话框 整刀回库 -->
-    <div v-if="isKnifeBack">
-      <wms-in-plan-knife-back-form-cmps :data-form.sync="form" :visible.sync="open" @confirm="getList"
-                                        @planTypeSelectChange="handlePlanTypeSelectChange"
-      ></wms-in-plan-knife-back-form-cmps>
-    </div>
+    <wms-in-plan-knife-back-form-cmps v-if="knifeBackVisible" :data-form.sync="form" :visible.sync="knifeBackVisible"
+                                      @confirm="getList"
+                                      @planTypeSelectChange="handlePlanTypeSelectChange"
+    ></wms-in-plan-knife-back-form-cmps>
 
   </div>
 </template>
 
 <script>
-import {listPLAN, getPLAN, delPLAN, addPLAN, updatePLAN, isDuplicatePlanCode,} from "@/api/wm/PLAN";
+import {listPLAN, getPLAN, delPLAN, addPLAN, updatePLAN, isDuplicatePlanCode, syncInBound,} from "@/api/wm/PLAN";
 import {listTYPE} from "@/api/md/TYPE";
 import {listMdItem} from "@/api/mes/md/mdItem"
 import {listArea} from "@/api/mes/wm/area"
 import {addWmsInTask} from "@/api/mes/wm/wmsInTask"
 import WmsInPlanDetailEntityTableCmps from "@/views/mes/wm/inPlan/wmsInPlanDetailEntityTableCmps.vue";
 import WmsInPlanKnifeBackFormCmps from "@/views/mes/wm/inPlan/wmsInPlanKnifeBackFormCmps.vue";
+import plan from "@/views/mes/cal/plan/index.vue";
 
 // 计划编码重复性验证
 const planCodeValidator = (rule, value, callback) => {
@@ -307,7 +269,7 @@ export default {
       // 库位列表
       areaList: [],
       // 弹出层标题
-      title: "",
+      dialogTitle: "",
       // 是否显示弹出层
       open: false,
       // 下发操作对话框
@@ -360,12 +322,7 @@ export default {
       }
     };
   },
-  computed: {
-    /** 控制弹窗类型 */
-    isKnifeBack() {
-      return this.form.planTypeId == 19;
-    }
-  },
+  computed: {},
   created() {
     this.getList();
   },
@@ -402,7 +359,6 @@ export default {
      * @param itemName
      */
     getMdItemList(itemName = "") {
-      this.loading = true;
       const params = {
         pageNum: 1,
         pageSize: 100,
@@ -418,7 +374,6 @@ export default {
      * @param areaName
      */
     getAreaList(areaName = "") {
-      this.loading = true;
       const params = {
         pageNum: 1,
         pageSize: 100,
@@ -431,15 +386,15 @@ export default {
     },
     /**
      * 过滤出入库类型
-     * @param id 出入库类型ID
+     * @param code 出入库类型 编码
      * @returns {*}
      */
-    filterInPlanType(id) {
-      const filter = this.inPlanTypeList.filter(item => item.typeId === id);
+    filterInPlanType(code) {
+      const filter = this.inPlanTypeList.filter(item => item.code === code);
       if (filter.length) {
         return filter[0].name
       }
-      return id
+      return code
     },
     /** 入库类型选择器回调 */
     handlePlanTypeSelectChange(typeId) {
@@ -501,6 +456,7 @@ export default {
         isDelete: null,
         planCode: null,
         planTypeId: null,
+        planTypeCode: null,
         wmsInPlanDetailsList: []
       };
       this.wmsInPlanDetailsList = [];
@@ -522,11 +478,32 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    handleSync() {
+      syncInBound().then(res => {
+        this.getList();
+        this.$message.success("数据同步成功");
+      })
+    },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(planTypeCode) {
       this.reset();
-      this.open = true;
-      this.title = "添加入库计划";
+      // 填充计划类型
+      const filter = this.inPlanTypeList.filter(item => item.code === planTypeCode);
+      if (filter.length) {
+        this.form.planTypeId = filter[0].typeId;
+        this.form.planTypeCode = filter[0].code;
+        this.form.planTypeName = filter[0].name;
+      } else {
+        this.$message.error("计划类型查找失败");
+        console.error("计划类型查找失败")
+        return;
+      }
+      if (planTypeCode === "DPRK") {
+        this.open = true;
+      } else {
+        this.knifeBackVisible = true;
+      }
+      this.dialogTitle = "新增" + filter[0].name;
     },
     /** 执行按钮操作 */
     async handleIssue(row) {
@@ -561,6 +538,7 @@ export default {
             materialId: planForm.materialId,
             materialCode: material[0].itemCode,
             planTypeId: planForm.planTypeId,
+            planTypeCode: planForm.planTypeCode,
             // 状态为待执行
             planInStatus: 0,
             // 入库计划明细ID
@@ -599,7 +577,7 @@ export default {
         this.form = response.data;
         this.wmsInPlanDetailsList = response.data.wmsInPlanDetailsList;
         this.open = true;
-        this.title = "修改入库计划";
+        this.dialogTitle = "修改入库计划";
       });
     },
     /** 提交按钮 */

src/views/mes/wm/inPlan/wmsInPlanDetailEntityTableCmps.vue

@@ -14,6 +14,10 @@ export default {
     planTypeId: {
       type: String,
       require: true
+    },
+    planTypeCode: {
+      type: String,
+      require: true
     }
   },
   data() {
@@ -61,6 +65,7 @@ export default {
     selectBaseKnifeChange(e) {
       if (this.selectIndex !== -1) {
         this.localEntityList[this.selectIndex].knifeId = e.baseKnifeId
+        this.localEntityList[this.selectIndex].rfid = e.rfid
         this.localEntityList[this.selectIndex].baseKnifeInfo = e
         // 获取物料信息
         listMdItem({itemCode: e.knifeCode}).then(res => {
@@ -97,8 +102,8 @@ export default {
         </el-button>
       </el-col>
     </el-row>
-    <!--整刀回库-->
-    <el-table :data="localEntityList" v-if="planTypeId==19" @selection-change="handleSelectionChange">
+    <!--工具回库-->
+    <el-table :data="localEntityList" v-if="planTypeCode==='GJHK'" @selection-change="handleSelectionChange">
       <el-table-column label="台账ID" align="center" prop="knifeId">
         <template slot-scope="scope">
           <el-input v-model="scope.row.knifeId" @change="updateEntityList">
@@ -111,26 +116,26 @@ export default {
           <el-input v-model="scope.row.source" @change="updateEntityList"></el-input>
         </template>
       </el-table-column>
-      <!--      <el-table-column label="消耗寿命" align="center" prop="consumeLife">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <el-input v-model="scope.row.consumeLife" type="number" min="0" @change="updateEntityList"></el-input>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
+<!--      <el-table-column label="消耗寿命" align="center" prop="consumeLife">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input v-model="scope.row.consumeLife" type="number" min="0" @change="updateEntityList"></el-input>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope)"
-              v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope)"
+            v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
           >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <!--刀柄入库-->
-    <el-table :data="localEntityList" v-if="planTypeId==7" @selection-change="handleSelectionChange">
+    <!--采购入库-->
+    <el-table :data="localEntityList" v-if="planTypeCode==='CGRK'" @selection-change="handleSelectionChange">
       <el-table-column label="RFID" align="center" prop="rfid">
         <template slot-scope="scope">
           <el-input v-model="scope.row.rfid" @change="updateEntityList"></el-input>
@@ -139,45 +144,18 @@ export default {
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope)"
-              v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--拆刀回库-->
-    <el-table :data="localEntityList" v-if="planTypeId==15" @selection-change="handleSelectionChange">
-      <el-table-column label="台账ID" align="center" prop="knifeId">
-        <template slot-scope="scope">
-          <el-input v-model="scope.row.knifeId" @change="updateEntityList">
-            <el-button slot="append" icon="el-icon-search" @click="showBaseKnifeDialog(scope)"></el-button>
-          </el-input>
-        </template>
-      </el-table-column>
-      <el-table-column label="来源" align="center" prop="source">
-        <template slot-scope="scope">
-          <el-input v-model="scope.row.source" @change="updateEntityList"></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope)"
-              v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope)"
+            v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
           >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <base-knife-select-cmps :visible.sync="baseKnifeVisible"
+    <base-knife-select-cmps :visible.sync="baseKnifeVisible" :knife-type="getKnifeType"
                             @change="selectBaseKnifeChange"></base-knife-select-cmps>
   </div>
 </template>

src/views/mes/wm/inPlan/wmsInPlanKnifeBackFormCmps.vue

@@ -29,7 +29,6 @@ export default {
       wmsInPlanDetailEntityList: [],
       // 表单校验
       rules: {
-        planCode: [{required: true}],
         relBillCode: [{required: true}],
       },
       localVisible: this.visible,
@@ -40,7 +39,7 @@ export default {
   },
   computed: {
     title() {
-      return this.localDataForm.planId ? "修改入库计划" : "新增入库计划"
+      return (this.localDataForm.planId ? "修改" : "新增") + this.dataForm.planTypeName
     },
   },
   methods: {
@@ -63,15 +62,22 @@ export default {
       this.$emit("update:visible", false)
     },
     async validateRfid() {
-      const rfidList = this.wmsInPlanDetailEntityList.map(entity => entity.rfid);
-      if (rfidList.length === 0) return
+      const rfidList = this.wmsInPlanDetailEntityList.filter(entity => entity.rfid && entity.rfid.trim().length > 0).map(entity => entity.rfid);
+      console.log(rfidList)
+      if (!Array.isArray(rfidList) || rfidList.length === 0) return
+      // 本地重复列表
+      const duplicateList = rfidList.filter((item, index) => rfidList.indexOf(item) !== index);
+      if (Array.isArray(rfidList) || rfidList.length) {
+        return duplicateList;
+      }
       const res = await isDuplicateRfid(rfidList.join(","));
       return res.data
     },
     /** 提交按钮 */
     async submitForm() {
       const validateRfidResult = await this.validateRfid();
-      if (validateRfidResult.length > 0) {
+      // 计划类型为采购入库 则开启rfid校验
+      if (Array.isArray(validateRfidResult) && validateRfidResult.length > 0 && this.localDataForm.planTypeCode === "CGRK") {
         this.$modal.msgError(`RFID重复：${validateRfidResult}`);
         return;
       }
@@ -199,24 +205,12 @@ export default {
     <!--状态为1已执行 则禁用-->
     <el-form ref="form" :model="localDataForm" :rules="rules" label-width="80px" inline
              :disabled="localDataForm.state === '1'">
-      <el-form-item label="计划编码" prop="planCode">
-        <el-input v-model="localDataForm.planCode" placeholder="请输入计划编码"></el-input>
-      </el-form-item>
-      <el-form-item label="入库类型" prop="planTypeId">
-        <el-select v-model="localDataForm.planTypeId" placeholder="请选择入库类型" @change="handlePlanTypeSelectChange">
-          <el-option :label="item.name" :value="item.typeId" v-for="item in inPlanTypeList"
-                     :key="item.typeId"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="源头单据" prop="relBillCode">
-        <el-input v-model="localDataForm.relBillCode" placeholder="请输入源头单据"></el-input>
-      </el-form-item>
+      <!--      <el-form-item label="计划编码" prop="planCode">-->
+      <!--        <el-input v-model="localDataForm.planCode" placeholder="请输入计划编码"></el-input>-->
+      <!--      </el-form-item>-->
       <el-form-item label="备注" prop="remark">
         <el-input v-model="localDataForm.remark" placeholder="请输入备注"></el-input>
       </el-form-item>
-      <el-form-item label="批次" prop="batch">
-        <el-input v-model="wmsInPlanDetailForm.batch" plcaeholder="请输入批次"></el-input>
-      </el-form-item>
       <el-form-item label="库位" prop="cellId">
         <el-select v-model="wmsInPlanDetailForm.cellId" placeholder="请选择库位" filterable remote
                    :remote-method="getAreaList" clearable>
@@ -227,7 +221,7 @@ export default {
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="物品" prop="materialId" v-if="localDataForm.planTypeId==7">
+      <el-form-item label="物品" prop="materialId" v-if="localDataForm.planTypeCode==='CGRK'">
         <el-select v-model="wmsInPlanDetailForm.materialId" placeholder="请选择物料" filterable remote
                    :remote-method="getMdItemList" clearable>
           <el-option :label="item.itemName" :value="item.itemId.toString()" v-for="item in mdItemList"
@@ -238,10 +232,11 @@ export default {
         </el-select>
       </el-form-item>
 
-      <el-divider content-position="center">整刀实例</el-divider>
+      <el-divider content-position="center">台账实例</el-divider>
       <wms-in-plan-detail-entity-table-cmps
         :entityList.sync="wmsInPlanDetailEntityList"
         :planTypeId="localDataForm.planTypeId"
+        :planTypeCode="localDataForm.planTypeCode"
       ></wms-in-plan-detail-entity-table-cmps>
     </el-form>
     <div slot="footer" class="dialog-footer">

src/views/mes/wm/wmsInTask/index.vue

@@ -90,29 +90,22 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-          <!--          <el-button-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-edit"-->
-          <!--            @click="openTaskDetailDialog(scope.row)"-->
-          <!--          >详情-->
-          <!--          </el-button>-->
+          <!--下发按钮禁用逻辑：状态为已执行 or 库位编码为自动分配-->
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            :disabled="scope.row.planInStatus === '1'"
+            :disabled="scope.row.planInStatus === '1' || scope.row.cellCode==='TEMP'"
             @click="handleIssue(scope.row)"
           >下发
           </el-button>
-          <!--          <el-button-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-delete"-->
-          <!--            @click="handleDelete(scope.row)"-->
-          <!--            v-hasPermi="['wm:wmsInTask:remove']"-->
-          <!--          >删除-->
-          <!--          </el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            :disabled="scope.row.planInStatus === '1'"
+            @click="manualIssue(scope.row)"
+          >手动入库
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -281,16 +274,16 @@ export default {
         taskId: task.id,
         // 库位 信息
         cellCode: task.cellCode,
-        cellX:task.cellX,
-        cellY:task.cellY,
-        cellZ:task.cellZ,
+        cellX: task.cellX,
+        cellY: task.cellY,
+        cellZ: task.cellZ,
         // 库房类型编码
-        warehouseTypeCode:"DDJ",
+        warehouseTypeCode: "DDJ",
         // 物料信息
-        materialId: task.materialId,
-        materialCode: task.materialCode,
-        materialName: task.materialName,
-        materialCount: task.actualInQuantity,
+        // materialId: task.materialId,
+        // materialCode: task.materialCode,
+        // materialName: task.materialName,
+        // materialCount: task.actualInQuantity,
         rfid: "",
         // 出库OR入库
         type: "RK",
@@ -305,6 +298,15 @@ export default {
       //   this.getList();
       // });
     },
+    /**
+     * 手动执行入库任务
+     */
+    manualIssue(task) {
+      issueBatchWmsInTask([task.id.toString()]).then(response => {
+        this.$modal.msgSuccess("执行成功");
+        this.getList();
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;

src/views/mes/wm/zdTask/index.vue

@@ -193,6 +193,7 @@
               {{scope.row.standardDosage * form.productIdQty}}
             </template>
           </el-table-column>
+          <el-table-column label="当前库存" prop="currentInventory" min-width="150" />
         </el-table>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -243,6 +244,7 @@
               {{scope.row.standardDosage * form.productIdQty}}
             </template>
           </el-table-column>
+          <el-table-column label="当前库存" prop="currentInventory" min-width="150" />
         </el-table>
       </el-form>
       <div slot="footer" class="dialog-footer">

vue.config.js

@@ -43,11 +43,18 @@ module.exports = {
       },
       '/ureport': {
         target: 'http://localhost:8080',
-        ws:false,
+        ws: false,
         changeOrigin: true,
         pathRewrite: {
           '^/ureport': '/ureport'
         }
+      }, '/wcs': {
+        target: 'http://192.168.8.60:1880',
+        ws: false,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/wcs': ''
+        }
       },
     },
     disableHostCheck: true
@@ -55,7 +62,7 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        sassOptions: { outputStyle: "expanded" }
+        sassOptions: {outputStyle: "expanded"}
       }
     }
   },
@@ -104,39 +111,39 @@ module.exports = {
             .plugin('ScriptExtHtmlWebpackPlugin')
             .after('html')
             .use('script-ext-html-webpack-plugin', [{
-            // `runtime` must same as runtimeChunk name. default is `runtime`
+              // `runtime` must same as runtimeChunk name. default is `runtime`
               inline: /runtime\..*\.js$/
             }])
             .end()
           config
             .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
+            chunks: 'all',
+            cacheGroups: {
+              libs: {
+                name: 'chunk-libs',
+                test: /[\\/]node_modules[\\/]/,
+                priority: 10,
+                chunks: 'initial' // only package third parties that are initially dependent
+              },
+              elementUI: {
+                name: 'chunk-elementUI', // split elementUI into a single package
+                priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+              },
+              commons: {
+                name: 'chunk-commons',
+                test: resolve('src/components'), // can customize your rules
+                minChunks: 3, //  minimum common number
+                priority: 5,
+                reuseExistingChunk: true
               }
-            })
+            }
+          })
           config.optimization.runtimeChunk('single'),
-          {
-             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-             to: './' //到根目录下
-          }
+            {
+              from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+              to: './' //到根目录下
+            }
         }
       )
   }