工单管理

lms/nladmin-ui/src/views/wms/pdm/produce/ViewDialog.vue

@@ -182,7 +182,7 @@
 
 <script>
 import { crud } from '@crud/crud'
-import crudProduceshiftorder from '@/api/wms/pdm/produceshiftorder'
+import crudProduceshiftorder from '@/api/wms/pdm/workorder'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudClassstandard from '@/api/wms/basedata/classstandard'

lms/nladmin-ui/src/views/wms/pdm/produce/index.vue

@@ -81,6 +81,23 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="工序名称">
+            <el-select
+              v-model="query.workorder_procedure"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.workorder_procedure"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
@@ -166,9 +183,6 @@
               disabled
             />
           </el-form-item>
-          <el-form-item label="物料单重" prop="material_weight">
-            <el-input v-model="form.material_weight" style="width: 200px;" />
-          </el-form-item>
           <el-form-item label="计划数量" prop="plan_qty">
             <el-input v-model="form.plan_qty" style="width: 200px;" />
           </el-form-item>
@@ -181,6 +195,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="所属工序">
+            <el-select
+              v-model="form.workorder_procedure"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.workorder_procedure"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="计划开始时间" prop="planproducestart_date">
             <el-date-picker
               v-model="form.planproducestart_date"
@@ -227,12 +257,11 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
-        <el-table-column prop="produceorder_code" label="工单编号" width="120px">
-          <template slot-scope="scope">
-            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>
-          </template>
+        <el-table-column prop="workorder_code" label="工单编号" width="120px">
+<!--          <template slot-scope="scope">-->
+<!--            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
+<!--          </template>-->
         </el-table-column>
-        <el-table-column prop="producedeviceorder_code" label="机台工单号" width="100px" />
         <el-table-column prop="order_status" label="工单状态">
           <template slot-scope="scope">
             {{ dict.label.MPS_BD_ORDERSTATUS[scope.row.order_status] }}
@@ -289,7 +318,7 @@
 </template>
 
 <script>
-import crudProduceshiftorder from '@/api/wms/pdm/produceshiftorder'
+import crudWorkorder from '@/api/wms/pdm/workorder'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -340,10 +369,10 @@ export default {
   name: 'Produceshiftorder',
   components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl, ViewDialog, DeviceDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'vehicle_type'],
+  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'vehicle_type', 'workorder_procedure'],
   cruds() {
     return CRUD({
-      title: '工单', url: 'api/produceshiftorder', idField: 'workorder_id', sort: 'workorder_id,desc',
+      title: '工单', url: 'api/workorder', idField: 'workorder_id', sort: 'workorder_id,desc',
       optShow: {
         add: true,
         edit: false,
@@ -354,7 +383,7 @@ export default {
       query: {
         order_status: '-1'
       },
-      crudMethod: { ...crudProduceshiftorder }
+      crudMethod: { ...crudWorkorder }
     })
   },
   data() {
@@ -382,9 +411,6 @@ export default {
         material_code: [
           { required: true, message: '物料编码不能为空', trigger: 'change' }
         ],
-        material_weight: [
-          { required: true, message: '物料单重不能为空', trigger: 'blur' }
-        ],
         planproducestart_date: [
           { required: true, message: '计划生产开始时间不能为空', trigger: 'blur' }
         ],
@@ -427,7 +453,7 @@ export default {
     },
     // 强制完成
     forceFinish(data) {
-      crudProduceshiftorder.forceFinish({ row: data }).then(res => {
+      crudWorkorder.forceFinish({ row: data }).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
@@ -457,7 +483,7 @@ export default {
     },
     // 下发
     submits(row) {
-      crudProduceshiftorder.submits({ workorder_id: row.workorder_id }).then(res => {
+      crudWorkorder.submits({ workorder_id: row.workorder_id }).then(res => {
         this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })