添加工作中心发料

src/api/mes/pro/material.js

+import request from '@/utils/request'
+
+// 查询工作中心发料申请列表
+export function listMaterial(query) {
+  return request({
+    url: '/pro/material/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询工作中心发料申请详细
+export function getMaterial(workstationMaterialId) {
+  return request({
+    url: '/pro/material/' + workstationMaterialId,
+    method: 'get'
+  })
+}
+
+// 新增工作中心发料申请
+export function addMaterial(data) {
+  return request({
+    url: '/pro/material',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改工作中心发料申请
+export function updateMaterial(data) {
+  return request({
+    url: '/pro/material',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工作中心发料申请
+export function delMaterial(workstationMaterialId) {
+  return request({
+    url: '/pro/material/' + workstationMaterialId,
+    method: 'delete'
+  })
+}

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

@@ -396,6 +396,18 @@ export default {
       optType: null,
       // 表单校验
       rules: {
+
+      
+                taskCode: [
+                    { required: true, message: "任务单号称不能为空", trigger: "blur" }
+                ],
+                arrangeCode: [
+                    { required: true, message: "编排单号称不能为空", trigger: "blur" }
+                ],
+                createTime: [
+                    { required: true, message: "编排单号称不能为空", trigger: "blur" }
+                ],
+            
       }
     };
   },

src/views/mes/pro/workstationRequest/components/arangeSelect.vue

+<template>
+    <el-dialog title="编排单号"
+      v-if="showFlag"
+      :visible.sync="showFlag"
+      :modal= false
+      width="80%"
+      center
+      >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+            <el-form-item label="编排单号" prop="arrangeCode">
+              <el-input
+                v-model="queryParams.arrangeCode"
+                placeholder="请输入编排单号"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </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>
+            </el-form-item>
+      </el-form>
+  
+        <el-table v-loading="loading" :data="protaskList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+          <el-table-column  width="55" align="center" >
+            <template v-slot="scope">
+              <el-radio v-model="selectedTaskId" :label="scope.row.arrangeId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column label="编排单号" align="center"  prop="arrangeCode" :show-overflow-tooltip="true"/>
+          <el-table-column label="生产工单" align="center"  prop="workorderCode" :show-overflow-tooltip="true"/>
+          <el-table-column label="分组号" align="center"  prop="groupCode" :show-overflow-tooltip="true"/>
+      
+          <el-table-column v-if="btnShow" label="操作" align="center" width="100px" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['mes:pro:protask:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['mes:pro:protask:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+        <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确 定</el-button>
+        <el-button @click="showFlag=false">取 消</el-button>
+      </div>
+      </el-dialog>
+    </template>
+  
+    <script>
+    import { listArrange } from "@/api/mes/pro/arrange";
+    // import {listAllProcess} from "@/api/mes/pro/process";
+    export default {
+      name: "ProtaskSelect",
+      props: {
+        workorderId: null,
+        workorderCode: null,
+        processId: null,
+        processCode: null,
+        workstationId: null,
+        workstationCode: null,
+        arrangeCode: null,
+        btnShow: false
+      },
+      watch: {
+        arrangeCode(v){
+            this.queryParams.arrangeCode = v;
+            this.getList();
+        }
+      },
+      data() {
+        return {
+          showFlag: false,
+          selectedTaskId: undefined,
+          selectedRow: undefined,
+          // 遮罩层
+          loading: true,
+          // 选中数组
+          ids: [],
+          // 非单个禁用
+          single: true,
+          // 非多个禁用
+          multiple: true,
+          // 显示搜索条件
+          showSearch: true,
+          // 总条数
+          total: 0,
+          // 生产任务表格数据
+          protaskList: [],
+          // 弹出层标题
+          title: "",
+          // 是否显示弹出层
+          open: false,
+          // 查询参数
+          queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            arrangeCode: null,
+            taskName: null,
+            workorderId: this.workorderId,
+            workorderCode: this.workorderCode,
+            workorderName: null,
+            workstationId: null,
+            workstationCode: null,
+            workstationName: null,
+            routeId: null,
+            processId: this.processId,
+            processCode: null,
+            processName: null,
+            itemId: null,
+            itemCode: null,
+            itemName: null,
+            specification: null,
+            unitOfMeasure: null,
+            quantity: null,
+            quantityProduced: null,
+            quantityChanged: null,
+            clientId: null,
+            clientCode: null,
+            clientName: null,
+            clientNick: null,
+            startTime: null,
+            duration: null,
+            endTime: null,
+            colorCode: null,
+            requestDate: null,
+          },
+          // 表单参数
+          form: {},
+          // 表单校验
+          rules: {
+            workstationId: [
+              { required: true, message: "工作中心不能为空", trigger: "blur" }
+            ],
+            quantity: [
+              { required: true, message: "排产数量不能为空", trigger: "blur" }
+            ],
+            startTime: [
+              { required: true, message: "请选择开始生产日期",trigger: "blur"}
+            ],
+            duration: [
+              { required: true, message: "清输入估算的生产用时",trigger: "blur"}
+            ]
+          }
+        };
+      },
+      created() {
+        this.getList();
+      },
+      methods: {
+        /** 查询生产任务列表 */
+        getList() {
+          this.loading = true;
+          listArrange(this.queryParams).then(response => {
+            this.protaskList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        },
+  
+        /** 搜索按钮操作 */
+        handleQuery() {
+          this.queryParams.pageNum = 1;
+          this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams = {
+            pageNum: 1,
+            pageSize: 10,
+            arrangeCode: null,
+            taskName: null,
+            workorderId: null,
+            workorderCode: null,
+            workorderName: null,
+            workstationId: null,
+            workstationCode: null,
+            workstationName: null,
+            routeId: null,
+            processId: null,
+            processCode: null,
+            processName: null,
+            itemId: null,
+            itemCode: null,
+            itemName: null,
+            specification: null,
+            unitOfMeasure: null,
+            quantity: null,
+            quantityProduced: null,
+            quantityChanged: null,
+            clientId: null,
+            clientCode: null,
+            clientName: null,
+            clientNick: null,
+            startTime: null,
+            duration: null,
+            endTime: null,
+            colorCode: null,
+            requestDate: null,
+          }
+          this.resetForm("queryForm");
+          this.handleQuery();
+        },
+  
+        handleCurrent(row){
+          if(row){
+              this.selectedRow = row;
+            }
+        },
+        //行双击选中
+        handleRowDbClick(row){
+          if(row){
+            this.selectedRow = row;
+            this.$emit('onSelected',this.selectedRow);
+            this.showFlag = false;
+          }
+        },
+        // 单选选中数据
+        handleRowChange(row) {
+          debugger;
+          if(row){
+            this.selectedRow = row;
+          }
+        },
+        //确定选中
+        confirmSelect(){
+            if(this.selectedTaskId ==null || this.selectedTaskId==0){
+                this.$notify({
+                    title:'提示',
+                    type:'warning',
+                    message: '请至少选择一条数据!'
+                });
+                return;
+            }
+            this.$emit('onSelected',this.selectedRow);
+            this.showFlag = false;
+        }
+      }
+    };
+    </script>
+  
\ No newline at end of file

src/views/mes/pro/workstationRequest/components/codeSelect.vue

+<template>
+    <el-dialog title="工作单元选择" v-if="showFlag" :visible.sync="showFlag" :modal="false" width="80%" center>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+        <el-row>
+          
+            <el-form-item label="工作中心编号" label-width="120" prop="workstationCode">
+              <el-input v-model="queryParams.workstationCode" placeholder="请输入工作中心编号" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          
+          
+            <el-form-item label="工作单元名称" label-width="120" prop="workunitName">
+              <el-input v-model="queryParams.workunitName" placeholder="请输入工作单元名称" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          
+          
+            <el-form-item label="所属工序" label-width="120" prop="processName">
+              <el-input v-model="queryParams.processName" placeholder="请输入工作中心编号" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+       
+            <el-form-item label="所在车间" prop="workshopName">
+              <el-select v-model="queryParams.workshopId" placeholder="请选择车间">
+                <el-option v-for="item in workshopOptions" :key="item.workshopId" :label="item.workshopName"
+                  :value="item.workshopId"></el-option>
+              </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>
+            </el-form-item>
+          
+        </el-row>
+        <el-row>
+          <el-col :span="24"> </el-col>
+        </el-row>
+      </el-form>
+  
+      <el-table v-loading="loading" :data="workstationList" @current-change="handleCurrent"
+        @row-dblclick="handleRowDbClick">
+        <el-table-column width="55" align="center">
+          <template v-slot="scope">
+            <el-radio v-model="selectedWorkstationId" :label="scope.row.workunitId"
+              @change="handleRowChange(scope.row)">{{ "" }}</el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
+        <el-table-column label="工作单元名称" align="center" prop="workunitName" />
+        <el-table-column label="工作中心编号" align="center" prop="workstationCode">
+        </el-table-column>
+        <el-table-column label="所在车间名称" align="center" prop="workshopName" />
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </template>
+  
+  <script>
+import { listWorkunits} from "@/api/mes/md/workunit";
+  // import { listAllProcess } from "@/api/mes/pro/process";
+  import { listAllWorkshop } from "@/api/mes/md/workshop";
+  export default {
+    name: "WorkstationSelect",
+    dicts: ["sys_yes_no"],
+    data() {
+      return {
+        // workstationId: this.workstationId,
+  
+        showFlag: false,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        selectedWorkstationId: undefined,
+        selectedRows: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 工作中心表格数据
+        workstationList: [],
+        //车间选项
+        workshopOptions: [],
+        //工序选项
+        processOptions: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          workstationCode: null,
+          workstationName: null,
+          workstationAddress: null,
+          workshopId: null,
+          workshopCode: null,
+          workshopName: null,
+          workstationId: null,
+          processCode: null,
+          processName: null,
+          enableFlag: null,
+          stdWorkingTime: null,
+        },
+        // 表单参数
+        form: {},
+      };
+    },
+    props: {
+      workstationId: {
+        type: Number | undefined,
+        default: undefined,
+      }, //外部传入的工序过滤条件
+    },
+    created() {
+      this.getList();
+      this.getWorkshops();
+      this.getProcess();
+    },
+    watch: {
+      workstationId: {
+        handler(val) {
+          this.queryParams.workstationId = val;
+          this.getList();
+        },
+        immediate: true,
+      },
+    },
+    methods: {
+      /** 查询工作中心列表 */
+      getList() {
+        this.loading = true;
+        listWorkunits(this.queryParams).then((response) => {
+          console.log(this.queryParams);
+          this.workstationList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      //查询车间信息
+      getWorkshops() {
+        listAllWorkshop().then((response) => {
+          this.workshopOptions = response.data;
+        });
+      },
+      // //查询工序信息
+      // getProcess() {
+      //   listAllProcess().then((response) => {
+      //     this.processOptions = response.data;
+      //   });
+      // },
+      // 取消按钮
+      cancel() {
+        this.showFlag=false;
+        this.resetQuery();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          workstationId: null,
+          workstationCode: null,
+          workstationName: null,
+          workstationAddress: null,
+          workshopId: null,
+          workshopCode: null,
+          workshopName: null,
+          workstationId: null,
+          processCode: null,
+          processName: null,
+          remark: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          stdWorkingTime: null,
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          workstationId: null,
+          workstationCode: null,
+          workstationName: null,
+          workstationAddress: null,
+          workshopId: null,
+          workshopCode: null,
+          workshopName: null,
+          workstationId: null,
+          processCode: null,
+          processName: null,
+          remark: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          stdWorkingTime: null,
+        };
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      handleCurrent(row) {
+        if (row) {
+          this.selectedRows = row;
+        }
+      },
+      // 单选选中数据
+      handleRowChange(row) {
+        if (row) {
+          this.selectedRows = row;
+        }
+      },
+      //双击选中
+      handleRowDbClick(row) {
+        if (row) {
+          this.selectedRows = row;
+          this.$emit("onSelected", this.selectedRows);
+          this.showFlag = false;
+        }
+      },
+      //确定选中
+      confirmSelect() {
+        if (
+          this.selectedWorkstationId == null ||
+          this.selectedWorkstationId == 0
+        ) {
+          this.$notify({
+            title: "提示",
+            type: "warning",
+            message: "请至少选择一条数据!",
+          });
+          return;
+        }
+        this.$emit("onSelected", this.selectedRows);
+        this.showFlag = false;
+      },
+    },
+  };
+  </script>
+  
\ No newline at end of file

src/views/mes/pro/workstationRequest/components/taskSelect.vue

+<template>
+  <el-dialog title="生产任务选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="80%"
+    center
+    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+          <el-form-item label="所属工作中心编号" prop="workstationCode">
+            <el-input
+              v-model="queryParams.workstationCode"
+              placeholder="请输入工作中心编号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="任务编号" prop="taskCode">
+            <el-input
+              v-model="queryParams.taskCode"
+              placeholder="请输入生产任务编号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </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>
+          </el-form-item>
+    </el-form>
+
+      <el-table v-loading="loading" :data="protaskList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+        <el-table-column  width="55" align="center" >
+          <template v-slot="scope">
+            <el-radio v-model="selectedTaskId" :label="scope.row.taskWorkunitId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column label="任务编号" align="center"  prop="taskCode" :show-overflow-tooltip="true"/>
+        <el-table-column label="编排单号" align="center"  prop="arrangeCode" :show-overflow-tooltip="true"/>
+        <el-table-column label="工作中心编号" align="center"  prop="workstationCode" :show-overflow-tooltip="true"/>
+        <el-table-column label="工作中心名称" align="center"  prop="workstationName" :show-overflow-tooltip="true"/>
+        <el-table-column label="工序名称" align="center"  prop="processName" :show-overflow-tooltip="true"/>
+    
+        <el-table-column v-if="btnShow" label="操作" align="center" width="100px" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['mes:pro:protask:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['mes:pro:protask:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="confirmSelect">确 定</el-button>
+      <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+    </el-dialog>
+  </template>
+
+  <script>
+  import { listProtasks, getProtask, delProtask, addProtask, updateProtask } from "@/api/mes/pro/protask";
+  import {listAllProcess} from "@/api/mes/pro/process";
+  import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
+  export default {
+    name: "ProtaskSelect",
+    components: {WorkstationSelect},
+    props: {
+      workorderId: null,
+      workorderCode: null,
+      processId: null,
+      processCode: null,
+      workstationId: null,
+      workstationCode: null,
+      arrangeCode: null,
+      btnShow: false
+    },
+    watch: {
+      workorderId(v){
+        this.queryParams.workorderId = v;
+      },
+      arrangeCode(v){
+        this.queryParams.arrangeCode = v;
+        this.getList();
+      }
+    },
+    data() {
+      return {
+        showFlag: false,
+        selectedTaskId: undefined,
+        selectedRow: undefined,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 生产任务表格数据
+        protaskList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          arrangeCode: null,
+          pageNum: 1,
+          pageSize: 10,
+          taskCode: null,
+          taskName: null,
+          workorderId: this.workorderId,
+          workorderCode: null,
+          workorderName: null,
+          workstationId: null,
+          workstationCode: null,
+          workstationName: null,
+          routeId: null,
+          processId: this.processId,
+          processCode: null,
+          processName: null,
+          itemId: null,
+          itemCode: null,
+          itemName: null,
+          specification: null,
+          unitOfMeasure: null,
+          quantity: null,
+          quantityProduced: null,
+          quantityChanged: null,
+          clientId: null,
+          clientCode: null,
+          clientName: null,
+          clientNick: null,
+          startTime: null,
+          duration: null,
+          endTime: null,
+          colorCode: null,
+          requestDate: null,
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          workstationId: [
+            { required: true, message: "工作中心不能为空", trigger: "blur" }
+          ],
+          quantity: [
+            { required: true, message: "排产数量不能为空", trigger: "blur" }
+          ],
+          startTime: [
+            { required: true, message: "请选择开始生产日期",trigger: "blur"}
+          ],
+          duration: [
+            { required: true, message: "清输入估算的生产用时",trigger: "blur"}
+          ]
+        }
+      };
+    },
+    created() {
+      this.getList();
+      this.getProcess();
+    },
+    methods: {
+      /** 查询生产任务列表 */
+      getList() {
+        this.loading = true;
+        listProtasks(this.queryParams).then(response => {
+          this.protaskList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      //查询工序信息
+      getProcess(){
+        listAllProcess().then( response =>{
+          this.processOptions = response.data;
+        });
+      },
+
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams={
+          arrangeCode: null,
+          pageNum: 1,
+          pageSize: 10,
+          taskCode: null,
+          taskName: null,
+          workorderId: null,
+          workorderCode: null,
+          workorderName: null,
+          workstationId: null,
+          workstationCode: null,
+          workstationName: null,
+          routeId: null,
+          processId: null,
+          processCode: null,
+          processName: null,
+          itemId: null,
+          itemCode: null,
+          itemName: null,
+          specification: null,
+          unitOfMeasure: null,
+          quantity: null,
+          quantityProduced: null,
+          quantityChanged: null,
+          clientId: null,
+          clientCode: null,
+          clientName: null,
+          clientNick: null,
+          startTime: null,
+          duration: null,
+          endTime: null,
+          colorCode: null,
+          requestDate: null,
+        };
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+
+      handleCurrent(row){
+        if(row){
+            this.selectedRow = row;
+          }
+      },
+      //行双击选中
+      handleRowDbClick(row){
+        if(row){
+          this.selectedRow = row;
+          this.$emit('onSelected',this.selectedRow);
+          this.showFlag = false;
+        }
+      },
+      // 单选选中数据
+      handleRowChange(row) {
+        debugger;
+        if(row){
+          this.selectedRow = row;
+        }
+      },
+      //确定选中
+      confirmSelect(){
+          if(this.selectedTaskId ==null || this.selectedTaskId==0){
+              this.$notify({
+                  title:'提示',
+                  type:'warning',
+                  message: '请至少选择一条数据!'
+              });
+              return;
+          }
+          this.$emit('onSelected',this.selectedRow);
+          this.showFlag = false;
+      }
+    }
+  };
+  </script>