Merge branch 'dev' into master0616

src/api/mes/pro/dta.js

@@ -50,4 +50,12 @@ export function unMarkDelete(id) {
     url: '/pro/serial/record/unMarkDelete/' + id,
     method: 'delete'
   })
+}
+
+// 删除组合
+export function deleteCombination(id) {
+  return request({
+    url: '/md/dta/record/deleteCombination/' + id,
+    method: 'put'
+  })
 }
\ No newline at end of file

src/api/mes/pro/scheduleList.js

@@ -101,6 +101,15 @@ export function getProcessInfo(query) {
   });
 }
 
+// 查询任务工作单元列表
+export function postAssistMark(query) {
+  return request({
+    url: "mobile/pro/protask/assistMark",
+    method: "post",
+    data: query,
+  });
+}
+
 // 默认工作中心查询
 export function getdefaultWorkCenterList() {
   // workshopId workCenterId = workstationId workstationName  workunitId workunitName
@@ -126,3 +135,18 @@ export function openTaskWorkunit(id) {
   });
 }
 
+// 获取字典
+export function getDictAssistMark(id) {
+  return request({
+    url: "/mes/pro/taskWorkunit/getDictList/assistMark",
+    method: "get"
+  });
+}
+
+// 获取可用套数
+export function getavailableToolCount(id) {
+  return request({
+    url: "tm/tmToolMachines/availableToolCount/" + id,
+    method: "get"
+  });
+}

src/views/mes/pro/dta/index.vue

@@ -45,17 +45,7 @@
           v-hasPermi="['pro:scheduleSetupRule: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="['pro:scheduleSetupRule:remove']"
-        >删除</el-button>
-      </el-col>
+      
        -->
       <el-col :span="1.5">
         <el-button
@@ -77,11 +67,23 @@
           v-hasPermi="['pro:dta:queryLPN']"
         >查询LPN</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="['pro:dta:remove']"
+        >删除组合</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="scheduleSetupRuleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="排版编号" align="center" prop="dtaRecordCode" />
       <el-table-column label="工单编号" align="center" prop="workorderCode" />
       <el-table-column label="组合编码" align="center" prop="combinationCode"/>
       <el-table-column label="销售单号" align="center" prop="salesVoucher" />
@@ -254,7 +256,7 @@
 </template>
 
 <script>
-import { getDtaList, finishApi, cancelApi } from "@/api/mes/pro/dta";
+import { getDtaList, finishApi, cancelApi, deleteCombination } from "@/api/mes/pro/dta";
 import BrandSelect from "@/components/itemType/single.vue";
 import ProcessSelect from "@/components/process/taskSelectSingle.vue";
 import LPNList from "./components/LPN-list.vue";
@@ -428,9 +430,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ruleIds = row.ruleId || this.ids;
-      this.$modal.confirm('是否确认删除排产换型对照信息编号为"' + ruleIds + '"的数据项？').then(function() {
-        return delScheduleSetupRule(ruleIds);
+      const ruleIds = this.selectedRows.map(v => v.combinationCode)
+      this.$modal.confirm('是否确认删除组合编码为"' + ruleIds.join(',') + '"的数据项？').then(function() {
+        return deleteCombination(ruleIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

src/views/mes/pro/scheduleList/index.vue

@@ -122,7 +122,16 @@
               </el-option>
             </el-select>
           </el-form-item>
-
+          <el-form-item label="已发外协" prop="assistMark">
+            <el-select v-model="queryParams.assistMark" placeholder="请选择已发外协" clearable>
+              <el-option
+                v-for="dict in AssistMarkDicts"
+                :key="dict.dictValue"
+                :label="dict.dictKey"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -244,6 +253,11 @@
       <el-table-column label="已完成数量" align="center" prop="quantityQualify" />
       <el-table-column label="委外已收货数量" align="center" prop="quantityAssistFinish" />
       <el-table-column label="委外待收货数量" align="center" prop="quantityAssist" />
+      <el-table-column label="已发外协" align="center" prop="assistMark">
+        <template slot-scope="{ row }">
+          <el-checkbox v-model="row.assistMark" label="" size="large" true-label="1" false-label="0" @change="changeAssistMark(row)" />
+        </template>
+      </el-table-column>
       <el-table-column label="编排人员" align="center" prop="arrangeUsername" />
       <!-- <el-table-column label="工单编码" align="center" prop="workorderCode" /> -->
       <el-table-column
@@ -513,6 +527,11 @@
     >
       <el-form :model="Assignform" ref="Assignform" size="small" :inline="true">
         <el-row>
+          <el-col :span="24" style="color: red;">
+            <el-form-item label="可用刀模" prop="quantity" style="color: red;">
+              {{availableToolCount ? availableToolCount+'套' : '无需刀模'}}
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="排产数量" prop="quantity">
               <el-input-number
@@ -648,6 +667,9 @@ import {
   getworkshopList,
   getworkstationList,
   gettaskWorkunitList,
+  getDictAssistMark,
+  postAssistMark,
+  getavailableToolCount,
   getdefaultWorkCenterList} from '@/api/mes/pro/scheduleList'
 import {putProtaskSplit, splitWorkstation, deleteTask, unschedule, updateProTaskWorkunitApi} from '@/api/mes/pro/protask'
 import BrandSelect from "@/components/TmTool/index.vue";
@@ -695,6 +717,7 @@ export default {
       loading: false,
       // 选中数组
       ids: [],
+      availableToolCount: 0,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -710,6 +733,7 @@ export default {
       // 是否显示弹出层
       open: false,
       selectedRows: [],
+      AssistMarkDicts: [],
       workstationId: null,
       // 查询参数
       queryParams: {
@@ -720,6 +744,7 @@ export default {
         arrangeUsername: null,
         workorderCodes: null,
         processName: null,
+        assistMark: null,
         statusArr: ['PREPARE'],
         scheduleStartDate: null,
         scheduleEndDate: null,
@@ -781,6 +806,13 @@ export default {
       this.isOrder = true
       this.arrangCodeVisible = true
     },
+    changeAssistMark(row) {
+      postAssistMark({task_workunit_id: row.taskWorkunitId, assist_mark: row.assistMark}).then(res => {
+        if (res.code === 200) {
+          this.getList();
+        }
+      })
+    },
     handleSubmitJobAssignment() {
       if(!this.Assignform.quantity || this.Assignform.quantity === 0) return this.$modal.msgError("分派任务数量不可为0")
       if(!this.AssignList || this.AssignList.length === 0) return this.$modal.msgError("请先点击检查按钮，检查数据")
@@ -833,6 +865,9 @@ export default {
         }
         this.getList();
       });
+      getDictAssistMark().then(res => {
+        this.AssistMarkDicts = res.data || []
+      })
     },
     async hanldeGetworkshopList() {
       const response = await getworkshopList()
@@ -891,6 +926,16 @@ export default {
         workunitName: null,
         workunitId: null
       };
+      getavailableToolCount(this.selectedRows[0].taskWorkunitId).then(res => {
+        if(res.data && Number(res.data) > 0) {
+          this.availableToolCount = res.data
+        } else {
+          this.availableToolCount = 0
+        }
+      }).catch(e => {
+        this.availableToolCount = 0
+      }
+      )
       this.workstationId = this.selectedRows[0].workstationId
       this.taskId = this.selectedRows[0].taskId
       console.log('this.selectedRows[0]', this.selectedRows[0])