opt:刻字输送线任务下发控制

2023-09-13 18:33:59 +08:00
parent aae00c55c4
commit 88c6ad2d37
16 changed files with 234 additions and 110 deletions
--- a/mes/qd/src/views/wms/analysis_manage/inspection/inspectionpoint.js
+++ b/mes/qd/src/views/wms/analysis_manage/inspection/inspectionpoint.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'

 export function add(data) {
  return request({
-    url: '/api/mdQlInspectionpoint/create',
+    url: '/api/inspectionItemPoint/create',
    method: 'post',
    data
  })
@@ -10,7 +10,7 @@ export function add(data) {

 export function del(ids) {
  return request({
-    url: '/api/mdQlInspectionpoint/delete',
+    url: '/api/inspectionItemPoint/delete',
    method: 'post',
    data: ids
  })
--- a/mes/qd/src/views/wms/masterdata_manage/master/materialParameters/index.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/master/materialParameters/index.vue
@@ -69,7 +69,7 @@
        <el-table-column prop="is_need_plan_name" label="是否参与需求计划计算" width="150px" />
        <el-table-column prop="stock_is_need_move" label="原料是否配粉移库" width="150px" :formatter="stockIsNeedMove" />
        <el-table-column prop="stock_standard_weight" label="原料标准桶重" width="100px" :formatter="crud.formatNum3" />
-        <el-table-column prop="stock_is_report_name" label="原料是否生成理化报告" width="150px" />
+        <el-table-column prop="stock_is_report_name" label="原料是否生成原料质检" width="150px" />
        <el-table-column prop="wc_seqno" label="原料碳化钨顺序号" width="120px" />
        <el-table-column prop="old_mark" label="原牌号" />
        <el-table-column prop="product_mode_name" label="生产方式" />
@@ -78,7 +78,7 @@
        <el-table-column prop="waste_limit_up" label="软废添加比列上限" width="120px" />
        <el-table-column prop="standard_weight_pft" label="工令标准桶重" width="100px" :formatter="crud.formatNum3" />
        <el-table-column prop="report_time" label="产品理化时间" width="100px" />
-        <el-table-column prop="produc_is_report_name" label="产品是否生成理化报告" width="150px" />
+        <el-table-column prop="produc_is_report_name" label="产品是否生成原料质检" width="150px" />
        <el-table-column prop="product_is_need_move" label="产品是否配粉移库" width="150px" :formatter="productIsNeedMove" />
        <el-table-column prop="is_again_put_name" label="是否二次投料" width="100px" />
        <el-table-column prop="produc_standard_weight" label="产品标准桶重" width="100px" :formatter="crud.formatNum3" />
--- a/mes/qd/src/views/wms/masterdata_manage/master/materialParameters/view/CpDialog.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/master/materialParameters/view/CpDialog.vue
@@ -214,7 +214,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="是否生成理化报告" prop="is_report">
+          <el-form-item label="是否生成原料质检" prop="is_report">
            <el-radio v-model="formData.is_report" label="0">否</el-radio>
            <el-radio v-model="formData.is_report" label="1">是</el-radio>
          </el-form-item>
--- a/mes/qd/src/views/wms/masterdata_manage/master/materialParameters/view/YflDialog.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/master/materialParameters/view/YflDialog.vue
@@ -88,7 +88,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="是否生成理化报告" prop="is_report">
+          <el-form-item label="是否生成原料质检" prop="is_report">
            <el-radio v-model="formData.is_report" label="0">否</el-radio>
            <el-radio v-model="formData.is_report" label="1">是</el-radio>
          </el-form-item>
--- a/mes/qd/src/views/wms/pcs/purchaseorder/AddDialog.vue
+++ b/mes/qd/src/views/wms/pcs/purchaseorder/AddDialog.vue
@@ -12,7 +12,7 @@
  >
    <el-row v-show="crud.status.cu > 0" :gutter="20">
      <el-col :span="20" style="border: 1px solid white">
-        <span/>
+        <span />
      </el-col>
      <el-col :span="4">
        <span>
@@ -57,16 +57,16 @@
      </el-form-item>
      <el-form-item label="物料编码" prop="material_code">
        <el-input v-model.trim="form.material_code" disabled class="input-with-select" style="width: 370px;">
-          <el-button slot="append" icon="el-icon-search" @click="insertEvent"/>
+          <el-button slot="append" icon="el-icon-search" @click="insertEvent" />
        </el-input>
      </el-form-item>
      <el-form-item label="物料名称" prop="material_name">
        <label slot="label">物料名称:</label>
-        <el-input v-model="form.material_name" size="mini" disabled style="width: 210px"/>
+        <el-input v-model="form.material_name" size="mini" disabled style="width: 210px" />
      </el-form-item>
      <el-form-item label="明细数" prop="detail_count">
        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
-        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px"/>
+        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
      </el-form-item>
      <el-form-item label="总重量" prop="total_qty">
        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -95,13 +95,13 @@
    <div class="crud-opts2" style="margin-bottom: 5px;">
      <span class="crud-opts-right2">
        <!--左侧插槽-->
-        <slot name="left"/>
+        <slot name="left" />
        <el-button
+          v-if="crud.status.add > 0"
          slot="left"
          class="filter-item"
          type="primary"
          icon="el-icon-plus"
-          v-if="crud.status.add > 0"
          size="mini"
          @click="add"
        >
@@ -118,10 +118,10 @@
      border
      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
    >
-      <el-table-column type="index" label="序号" width="55" align="center"/>
+      <el-table-column type="index" label="序号" width="55" align="center" />

-      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码"/>
-      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称"/>
+      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
      <el-table-column show-overflow-tooltip prop="ask_time" label="要求到货日期" style="width: 250px">
        <template slot-scope="scope">
          <el-date-picker
@@ -147,9 +147,13 @@
          />
        </template>
      </el-table-column>
-<!--      <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
-<!--      <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
-      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="数量单位"/>
+      <!--      <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
+      <!--      <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
+      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="数量单位">
+        <template scope="scope">
+          KG
+        </template>
+      </el-table-column>
      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="100" fixed="right">
        <template scope="scope">
          <el-button
@@ -173,7 +177,7 @@
 </template>

 <script>
-import CRUD, {crud, form} from '@crud/crud'
+import CRUD, { crud, form } from '@crud/crud'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 import crudPurchase from '@/views/wms/pcs/purchaseorder/purchase'

@@ -183,8 +187,8 @@ const defaultForm = {
  create_mode: '01',
  material_code: '',
  material_name: '',
-  qty_unit_id: '',
-  qty_unit_name: '',
+  qty_unit_id: '1',
+  qty_unit_name: 'KG',
  total_qty: 0,
  detail_count: '0',
  workshop_id: '',
@@ -193,7 +197,7 @@ const defaultForm = {

 export default {
  name: 'AddDialog',
-  components: {MaterDtl},
+  components: { MaterDtl },
  mixins: [crud(), form(defaultForm)],
  dicts: ['IO_BILL_STATUS', 'ST_INV_RAW_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
  data() {
@@ -207,13 +211,13 @@ export default {
      sects: [],
      rules: {
        product_code: [
-          {required: true, message: '生产车间不能为空', trigger: 'blur'}
+          { required: true, message: '生产车间不能为空', trigger: 'blur' }
        ],
        bill_type: [
-          {required: true, message: '业务类型不能为空', trigger: 'blur'}
+          { required: true, message: '业务类型不能为空', trigger: 'blur' }
        ],
        biz_date: [
-          {required: true, message: '业务日期不能为空', trigger: 'blur'}
+          { required: true, message: '业务日期不能为空', trigger: 'blur' }
        ]
      }
    }
@@ -268,15 +272,15 @@ export default {
      }
    },
    tableChanged(item) {
-      this.form.qty_unit_id = item.base_unit_id
-      this.form.qty_unit_name = item.base_unit_name
+      this.form.qty_unit_id = '1'
+      this.form.qty_unit_name = 'KG'
      this.form.material_code = item.material_code
      this.form.material_name = item.material_name
      this.form.material_id = item.material_id
      this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(row.plan_qty)
    },
    add() {
-      if (!this.form.material_code){
+      if (!this.form.material_code) {
        this.crud.notify('请选择一种物料进行新增！', CRUD.NOTIFICATION_TYPE.INFO)
        return false
      }
@@ -284,8 +288,8 @@ export default {
      row.material_code = this.form.material_code
      row.material_name = this.form.material_name
      row.qty_unit_name = this.form.qty_unit_name
-      this.$set(row,'ask_time',null)
-      this.$set(row,'qty',null)
+      this.$set(row, 'ask_time', null)
+      this.$set(row, 'qty', null)
      this.form.tableData.splice(-1, 0, row)
    },
    insertEvent() {
--- a/mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue
+++ b/mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue
@@ -11,7 +11,7 @@
    >
      <el-row :gutter="20">
        <el-col :span="18" style="border: 1px solid white">
-          <span/>
+          <span />
        </el-col>
        <el-col :span="6">
          <span>
@@ -150,7 +150,7 @@
          label="序号"
        >
          <template slot-scope="scope">
-            <span>{{ scope.$index + 1 }}</span>
+            <span>{{ scope.$index+1 }}</span>
          </template>
        </el-table-column>
        <el-table-column
@@ -167,6 +167,12 @@
          label="项点类别"
          :formatter="format_inspection_item_type"
        />
+        <el-table-column
+          width="100"
+          prop="inspection_type"
+          label="检测方式"
+          :formatter="typeFormat"
+        />
        <el-table-column
          prop="down_limit"
          label="合格下限(≥)"
@@ -187,6 +193,7 @@
        >
          <template slot-scope="scope">
            <el-input-number
+              v-if="scope.row.inspection_type=='02'"
              v-model="form1.tableData[scope.$index].value"
              :controls="false"
              size="mini"
@@ -194,6 +201,20 @@
              :disabled="form1.bill_status === '99'"
              :precision="4"
            />
+            <el-select
+              v-if="scope.row.inspection_type=='01'"
+              v-model="form1.tableData[scope.$index].value"
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
          </template>
        </el-table-column>

@@ -214,19 +235,19 @@
      </el-table>
    </el-dialog>

-    <MaterDtl :dialog-show.sync="materShow" :mater-opt-code="'05'" @tableChanged2="tableChanged2"/>
+    <MaterDtl :dialog-show.sync="materShow" :mater-opt-code="'05'" @tableChanged2="tableChanged2" />
  </div>
 </template>

 <script>
-import CRUD, {crud} from '@crud/crud'
+import CRUD, { crud } from '@crud/crud'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 import crudPhysicalMst from '@/views/wms/ql_manage/physicalMst/physicalMst'

 export default {
  name: 'Dialog1',
-  dicts: ['QL_TEST_POINTTYPE', 'qc_grade', 'qc_result'],
-  components: {MaterDtl},
+  dicts: ['QL_TEST_POINTTYPE', 'qc_grade', 'qc_result', 'QC_INSPECTION_TYPE', 'IS_OR_NOT'],
+  components: { MaterDtl },
  mixins: [crud()],
  props: {
    visiable1: {
@@ -286,10 +307,7 @@ export default {
        }
      })
    },
-    cellStyle({row, column, rowIndex, columnIndex}) {
-      // https://blog.csdn.net/qq_41648113/article/details/109337781
-      // https://blog.csdn.net/Akatsuki233/article/details/100311040
-      // https://blog.csdn.net/qq_45414633/article/details/107795124
+    cellStyle({ row, column, rowIndex, columnIndex }) {
      const inspection_type = row.inspection_type
      const is_limit_remark = row.is_limit_remark
      const value = parseFloat(row.value)
@@ -326,6 +344,18 @@ export default {
          }
        }
      }
+      if (inspection_type == '01') {
+        if (column.property === 'value') {
+          if (value == 1) {
+            row.is_ok = '1'
+            row.form_remark = ''
+          } else {
+            return 'background: red'
+            row.is_ok = '0'
+            row.value = '0'
+          }
+        }
+      }
    },
    computerResult() {
      const rows = this.form1.tableData
@@ -340,13 +370,18 @@ export default {
      this.$set(this.form1, 'result', '1')
      var remark = ''
      for (var row of rows) {
-        if (row.is_ok === '0') {
-          this.$set(this.form1, 'result', '2')
-        } else {
-          if (row.is_limit_remark === '1' && row.form_remark) {
-            remark += row.form_remark.replace('\n', '') + ','
+        console.log(row.is_ok + '_' + row.value)
+        if (row.is_ok == '1') {
+          if (row.inspection_type == '01') {
+            if (row.value == '0') {
+              this.$set(this.form1, 'result', '2')
+              break
+            }
          }
        }
+        if (row.is_ok == '0') {
+          this.$set(this.form1, 'result', '2')
+        }
      }

      this.$set(this.form1, 'remark', remark)
@@ -356,9 +391,11 @@ export default {
    format_inspection_item_type(row, column) {
      return this.dict.label.QL_TEST_POINTTYPE[row.inspection_item_type]
    },
+    typeFormat(row, column) {
+      return this.dict.label.QC_INSPECTION_TYPE[row.inspection_type]
+    },

    onSubmit() {
-      debugger
      const msg = '是否继续！'
      const data = this.form1.tableData
      var flag = 0
--- a/mes/qd/src/views/wms/ql_manage/physicalMst/RelevancyDialog.vue
+++ b/mes/qd/src/views/wms/ql_manage/physicalMst/RelevancyDialog.vue
@@ -1,6 +1,6 @@
 <template>
  <el-dialog
-    title="理化报告单"
+    title="原料质检单"
    append-to-body
    :visible.sync="dialogVisible"
    destroy-on-close
--- a/mes/qd/src/views/wms/ql_manage/physicalMst/index.vue
+++ b/mes/qd/src/views/wms/ql_manage/physicalMst/index.vue
@@ -73,7 +73,7 @@
              />
            </el-select>
          </el-form-item>
-          <rrOperation/>
+          <rrOperation />
        </el-form>
      </div>

@@ -111,10 +111,10 @@
        width="600px"
      >
        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
-          <el-input v-if="false" v-model="form.material_id"/>
+          <el-input v-if="false" v-model="form.material_id" />

          <el-form-item label="质检单号" prop="inspection_code">
-            <el-input v-model.trim="form.inspection_code" placeholder="系统生成" disabled style="width: 370px;"/>
+            <el-input v-model.trim="form.inspection_code" placeholder="系统生成" disabled style="width: 370px;" />
          </el-form-item>
          <el-form-item label="单据类型" prop="inspection_type">
            <el-select
@@ -133,17 +133,17 @@
          </el-form-item>
          <el-form-item label="源单号" prop="source_bill_code">
            <el-input v-model.trim="form.source_bill_code" disabled class="input-with-select" style="width: 370px;">
-              <el-button slot="append" icon="el-icon-search" @click="querySale"/>
+              <el-button slot="append" icon="el-icon-search" @click="querySale" />
            </el-input>
          </el-form-item>
          <el-form-item label="物料" prop="material_name">
-            <el-input v-model.trim="form.material_name" style="width: 370px;"/>
+            <el-input v-model.trim="form.material_name" style="width: 370px;" />
          </el-form-item>
          <el-form-item label="数量（KG）" prop="qty">
-            <el-input v-model.trim="form.qty" style="width: 370px;"/>
+            <el-input v-model.trim="form.qty" style="width: 370px;" />
          </el-form-item>
          <el-form-item label="备注">
-            <el-input v-model.trim="form.remark" style="width: 370px;" rows="2" type="textarea"/>
+            <el-input v-model.trim="form.remark" style="width: 370px;" rows="2" type="textarea" />
          </el-form-item>
        </el-form>
        <div slot="footer" class="dialog-footer">
@@ -160,19 +160,19 @@
        style="width: 100%;"
        @selection-change="crud.selectionChangeHandler"
      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column prop="inspection_code" label="质检单号" width="135"/>
-        <el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip/>
-        <el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip/>
-        <el-table-column prop="qty" label="数量" min-width="100" show-overflow-tooltip/>
-        <el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus"/>
-        <el-table-column prop="result" label="结果" :formatter="format_result"/>
-        <el-table-column prop="remark" show-overflow-tooltip label="备注"/>
-        <el-table-column prop="source_bill_code" show-overflow-tooltip label="源单号"/>
-        <el-table-column prop="create_name" label="创建人"/>
-        <el-table-column prop="create_time" label="创建时间" width="135"/>
-        <el-table-column prop="confirm_optname" label="确认人" min-width="100"/>
-        <el-table-column prop="confirm_time" label="确认时间" width="135"/>
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="inspection_code" label="质检单号" width="135" />
+        <el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="qty" label="数量" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus" />
+        <el-table-column prop="result" label="结果" :formatter="format_result" />
+        <el-table-column prop="remark" show-overflow-tooltip label="备注" />
+        <el-table-column prop="source_bill_code" show-overflow-tooltip label="源单号" />
+        <el-table-column prop="create_name" label="创建人" />
+        <el-table-column prop="create_time" label="创建时间" width="135" />
+        <el-table-column prop="confirm_optname" label="确认人" min-width="100" />
+        <el-table-column prop="confirm_time" label="确认时间" width="135" />
        <el-table-column label="操作" width="120px" align="center" fixed="right">
          <template slot-scope="scope">
            <udOperation
@@ -185,18 +185,18 @@
        </el-table-column>
      </el-table>
      <!--分页组件-->
-      <pagination/>
+      <pagination />
    </div>

-    <BillDtl :dialog-show.sync="materShow" @setMaterValue="tableChanged2"/>
-    <Dialog1 :visiable1.sync="visiable1" :inspection-id="inspection_id"/>
+    <BillDtl :dialog-show.sync="materShow" @setMaterValue="tableChanged2" />
+    <Dialog1 :visiable1.sync="visiable1" :inspection-id="inspection_id" />

  </div>
 </template>

 <script>
 import crudPhysicalMst from '@/views/wms/ql_manage/physicalMst/physicalMst'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -219,12 +219,12 @@ const defaultForm = {
 }
 export default {
  name: 'QualityTest',
-  dicts: [ 'qc_result', 'QC_INSPECTION_SCHEME_TYPE', 'QC_BILL_STATUS'],
-  components: {pagination, crudOperation, rrOperation, udOperation, BillDtl, DateRangePicker, Dialog1 },
+  dicts: ['qc_result', 'QC_INSPECTION_SCHEME_TYPE', 'QC_BILL_STATUS'],
+  components: { pagination, crudOperation, rrOperation, udOperation, BillDtl, DateRangePicker, Dialog1 },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
    return CRUD({
-      title: '理化报告单',
+      title: '原料质检单',
      url: 'api/physicalMst',
      idField: 'inspection_id',
      sort: 'inspection_id desc',
@@ -235,7 +235,7 @@ export default {
        download: false,
        reset: true
      },
-      crudMethod: {...crudPhysicalMst}
+      crudMethod: { ...crudPhysicalMst }
    })
  },
  data() {
@@ -252,13 +252,13 @@ export default {
      },
      rules: {
        inspection_type: [
-          {required: true, message: '质检单类型不能为空', trigger: 'blur'}
+          { required: true, message: '质检单类型不能为空', trigger: 'blur' }
        ],
        biz_date: [
-          {required: true, message: '业务日期不能为空', trigger: 'blur'}
+          { required: true, message: '业务日期不能为空', trigger: 'blur' }
        ],
        pcsn: [
-          {required: true, message: '批号不能为空', trigger: 'blur'}
+          { required: true, message: '批号不能为空', trigger: 'blur' }
        ]
      }
    }
@@ -298,11 +298,11 @@ export default {
    },
    tableChanged2(rows) {
      const row = rows[0]
-      debugger
      // 新增一行物料时，给行进行赋值
      this.form.material_id = row.material_id
      this.form.material_code = row.material_code
      this.form.material_name = row.material_name
+      this.form.qty = row.qty
      this.form.source_bill_id = row.id
      this.form.source_bill_code = row.po_code
    },