外协任务执行重做

2020-02-21 15:52:33 +08:00
parent 4160cdcbb5
commit 756b6bac5c
4 changed files with 230 additions and 1188 deletions
--- a/src/api/Outsourcing/OutsourcingTaskExecution.js
+++ b/src/api/Outsourcing/OutsourcingTaskExecution.js
@@ -15,34 +15,6 @@ export function initOutHelp() {
    }
  })
 }
-// 初始化获取已生成的外协加工任务单
-export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3, check) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据_2020',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num + '&查询历史_check=' + check,
-      Pagination: pageCurrent + '&' + pageSize
-    }
-  })
-}
-// 初始化获取外协厂家数据
-export function getData1() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据'
-    }
-  })
-}
 // 初始化获取已预算价格，未选入到外协加工任务单的零件
 export function getTable1(check, partNumber) {
  return request({
@@ -52,11 +24,41 @@ export function getTable1(check, partNumber) {
      UserID: state.state.user.id,
      ModularID: router.currentRoute.path,
      type: '1',
-      name: '车间生产管理工艺_零件工艺计划_查询数据_外协_新',
+      name: '车间生产管理工艺_外协任务执行_未选入零件_查询',
      param: '零件图号_check=' + check + '=int&零件图号=' + partNumber + '=string'
    }
  })
 }
+// 初始化获取已生成的外协加工任务单
+export function getTable(checked, contractNumber, check, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理_外协加工任务单_查询数据_2020',
+      param: '表单号_check=' + checked + '&表单号=' + contractNumber + '&查询历史_check=' + check,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询任务单明细
+export function getParts(Number) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理工艺_外协任务执行_外协加工任务单明细_查询数据',
+      param: '外协加工任务单流水号=' + Number
+    }
+  })
+}
+
 // 打回
 export function getBack(processPlan) {
  return request({
@@ -71,59 +73,45 @@ export function getBack(processPlan) {
    }
  })
 }
-// 获取零件工序信息（零件号表中）
-export function getprocedure(processPlan, single) {
+// 选入零件
+export function insertParts(processNum, Number) {
  return request({
    url: '',
    method: 'post',
    data: {
      UserID: state.state.user.id,
      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_工艺名称简称_新',
-      param: '工艺计划流水号=' + processPlan + '=int&单件是否外协=' + single + '=int'
+      type: '2',
+      name: '车间生产管理工艺_外协加工任务单_选入_循环执行',
+      param: '外协加工任务单流水号=' + Number + '&工艺计划流水号组=' + processNum
    }
  })
 }
-// 外协厂家查询
-export function searchManufactor(check, name) {
+// 计算价格
+export function getPrice(Number, money) {
  return request({
    url: '',
    method: 'post',
    data: {
      UserID: state.state.user.id,
      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
-      param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=' + check + '=bit&外协厂家名称=' + name + '&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
+      type: '2',
+      name: '车间生产管理工艺_外协加工任务单_保存_循环执行',
+      param: '外协加工任务单明细流水号组=' + Number + '&加工价格_成交组=' + money
    }
  })
 }
-// 确定价格
-export function spareParts(processNum, single) {
+// 成交
+export function editData1(Number, manufacturers, freight, Explain) {
  return request({
    url: '',
    method: 'post',
    data: {
      UserID: state.state.user.id,
      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新',
-      param: '工艺计划流水号=' + processNum + '=int&工序数量=21=int&单件是否外协=' + single + '=int'
-    }
-  })
-}
-// 暂未启用
-export function spareParts1(processNum, single) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新',
-      param: '工艺计划流水号=' + processNum + '=int&工序数量=31=int&单件是否外协=' + single + '=int'
+      type: '2',
+      name: '车间生产管理_外协加工任务单_修改数据',
+      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0'
    }
  })
 }
@@ -155,20 +143,6 @@ export function editData(Number, manufacturers, freight, Explain) {
    }
  })
 }
-// 成交
-export function editData1(Number, manufacturers, freight, Explain) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据',
-      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=2&入库标志=1&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0'
-    }
-  })
-}
 // 删除外协加工任务单
 export function deleteData(Number) {
  return request({
@@ -197,34 +171,7 @@ export function deleteData1(Number) {
    }
  })
 }
-// 选入零件
-export function insertParts(processNum, Number) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '车间生产管理_外协加工任务单明细_增加数据',
-      param: '外协加工任务单流水号=' + Number + '=int&工艺计划流水号=' + processNum + '=int'
-    }
-  })
-}
-// 查询任务单明细
-export function getParts(Number) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理_外协加工任务单明细_查询数据',
-      param: '外协加工任务单流水号=' + Number + '=int'
-    }
-  })
-}
+
 // 数据库生产表单号
 export function getNumber(time) {
  return request({
@@ -239,17 +186,3 @@ export function getNumber(time) {
    }
  })
 }
-// 计算价格
-export function getPrice(Number, money, money1, money2, money3) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '车间生产管理_外协加工任务单明细_修改数据',
-      param: '外协加工任务单明细流水号=' + Number + '=int&加工价格_预算=' + money + '&加工价格_成交=' + money1 + '&材料价格_价格=' + money2 + '&其他价格=' + money3 + '&入库标志=1=int&交检数量=0=int&合格数量=0=int&回用数量=0=int&废品数量=0=int'
-    }
-  })
-}
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,7 +17,7 @@ export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` //
 export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
 export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
 export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESDownloadExcel.ashx' // 导出excel
+export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESCommonBase.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
 export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -32,7 +32,7 @@
    </el-card>
    <el-tabs type="border-card" @tab-click="selectPart">
      <el-tab-pane label="基本件">
-        <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1140px" height="300px" @selection-change="handleSelectionChange">
+        <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1160px" height="300px" @selection-change="handleSelectionChange">
          <el-table-column align="center" width="50" type="selection"/>
          <el-table-column label="零件名称" align="center" width="140px" show-overflow-tooltip>
            <template slot-scope="scope">
@@ -64,7 +64,7 @@
              {{ scope.row.机床数量 }}
            </template>
          </el-table-column>
-          <el-table-column label="零件总数量" align="center" width="90px">
+          <el-table-column label="零件总数量" align="center" width="110px">
            <template slot-scope="scope">
              {{ scope.row.总数量 }}
            </template>
@@ -119,7 +119,7 @@
              {{ scope.row.机床数量 }}
            </template>
          </el-table-column>
-          <el-table-column label="零件总数量" align="center" width="90px">
+          <el-table-column label="零件总数量" align="center" width="110px">
            <template slot-scope="scope">
              {{ scope.row.总数量 }}
            </template>
@@ -169,7 +169,7 @@
              {{ scope.row.机床数量 }}
            </template>
          </el-table-column>
-          <el-table-column label="零件总数量" align="center" width="90px">
+          <el-table-column label="零件总数量" align="center" width="110px">
            <template slot-scope="scope">
              {{ scope.row.总数量 }}
            </template>
@@ -473,7 +473,7 @@
            {{ scope.row.物料型号 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="零件数量" width="70">
+        <el-table-column align="center" label="零件数量" width="80">
          <template slot-scope="scope">
            {{ scope.row.零件数量 }}
          </template>
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue