Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

# Conflicts: # mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/TaskScheduleService.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderrecordService.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderrecordMapper.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java # mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/PdmProduceWorkorderrecordServiceImpl.java # mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
2023-05-29 08:58:58 +08:00
parent 83508f5176 09057be3f2
commit 49c47631d7
32 changed files with 1199 additions and 1053 deletions
--- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue
+++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue
@@ -206,6 +206,11 @@
              icon="el-icon-error"
              @click="doOperate(scope.row, 'b')"
            >取消</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-error"
+              @click="doOperate(scope.row, 'delete')"
+            >删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -382,6 +387,9 @@ export default {
        case 'd':// 详情
          method_name = 'view'
          break
+        case 'delete':// 详情
+          method_name = 'delete'
+          break
      }
      if (method_name === 'view') {
        this.view(row)
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
@@ -1,76 +1,57 @@
 <template>
  <el-dialog
-    :title="crud.status.title"
    append-to-body
+    title="入库详情"
+    :visible.sync="dialogVisible"
+    destroy-on-close
    fullscreen
-    :before-close="crud.cancelCU"
-    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
-    width="1200px"
-    @open="open"
    @close="close"
+    @open="open"
  >
-    <el-row v-show="crud.status.cu > 0" :gutter="20">
-      <el-col :span="20" style="border: 1px solid white">
-        <span />
-      </el-col>
-      <el-col :span="4">
-        <span>
-          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
-          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
-        </span>
-      </el-col>
-    </el-row>
-
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
      <el-form-item label="单据号" prop="bill_code">
        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
      </el-form-item>
-      <el-form-item label="仓库" prop="product_code">
-        <label slot="label">所属仓库2:</label>
-        <el-select
-          v-model="form.stor_id"
-          clearable
-          class="filter-item"
-          style="width: 210px"
-          :disabled="crud.status.view > 0"
-        >
-          <el-option
-            v-for="item in storlist"
-            :key="item.stor_id"
-            :label="item.stor_name"
-            :value="item.stor_id"
-          />
-        </el-select>
+      <el-form-item label="所属仓库" prop="stor_name">
+        <label slot="label">所属仓库:</label>
+        <el-input v-model="form.stor_name" disabled clearable style="width: 210px" />
      </el-form-item>
      <el-form-item label="入库点" prop="point_code">
        <label slot="label">入库点:</label>
+        <el-input v-model="form.point_code" disabled clearable style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="生产车间">
        <el-select
-          v-model="form.point_code"
+          v-model="form.product_area"
          clearable
+          size="mini"
+          placeholder="全部"
+          :disabled="true"
          class="filter-item"
-          style="width: 210px"
-          :disabled="crud.status.view > 0"
+          @change="crud.toQuery"
        >
          <el-option
-            v-for="item in storlist"
-            :key="item.stor_id"
-            :label="item.stor_name"
-            :value="item.stor_id"
+            v-for="item in dict.product_area"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
          />
        </el-select>
      </el-form-item>
-      <el-form-item label="业务类型" prop="bill_type">
+      <el-form-item label="业务类型">
        <el-select
          v-model="form.bill_type"
          clearable
+          filterable
+          size="mini"
+          :disabled="true"
          placeholder="业务类型"
-          style="width: 210px"
          class="filter-item"
-          :disabled="crud.status.view > 0"
+          @change="crud.toQuery"
        >
          <el-option
-            v-for="item in dict.bill_type"
+            v-for="item in dict.ST_INV_IN_TYPE"
            :key="item.value"
            :label="item.label"
            :value="item.value"
@@ -103,293 +84,141 @@
        <el-input-number
          v-model="form.total_qty"
          :controls="false"
+          :precision="3"
          :min="0"
          disabled
          style="width: 210px"
        />
      </el-form-item>
      <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true" />
      </el-form-item>
    </el-form>
-
-    <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-    <div v-show="crud.status.add === 1" class="crud-opts2" style="margin-bottom: 5px;">
-      <span class="crud-opts-right2">
-        <!--左侧插槽-->
-        <slot name="left" />
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="insertEvent()"
-        >
-          添加物料
-        </el-button>
-      </span>
-
+    <div class="crud-opts2">
+      <span class="role-span2">入库作业明细</span>
    </div>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      :data="form.tableData"
-      style="width: 100%;"
-      border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-    >
-      <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_spec" label="物料规格" />
-      <el-table-column show-overflow-tooltip prop="base_bill_code" label="订单号">
-        <template slot-scope="scope">
-          <el-input
-            v-model="form.tableData[scope.$index].base_bill_code"
-            clearable
-            :controls="false"
-            controls-position="right"
-            size="small"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="数量">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model="form.tableData[scope.$index].plan_qty"
-            size="small"
-            :controls="false"
-            controls-position="right"
-            precision="3"
-            :min="0"
-            @change="changeQty"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="unit_weight" label="单重">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model="form.tableData[scope.$index].unit_weight"
-            size="small"
-            :controls="false"
-            controls-position="right"
-            precision="3"
-            :min="0"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号">
-        <template slot-scope="scope">
-          <el-input
-            v-model="form.tableData[scope.$index].storagevehicle_code"
-            clearable
-            :controls="false"
-            controls-position="right"
-            size="small"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column v-if="crud.status.add === 1" align="center" label="操作" width="170" fixed="right">
-        <template scope="scope">
-          <el-button
-            type="danger"
-            class="filter-item"
-            size="mini"
-            icon="el-icon-delete"
-            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <MaterDtl
-      :dialog-show.sync="materShow"
-      :is-single="false"
-      :mater-opt-code="materType"
-      @setMaterValue="tableChanged"
-    />
-
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        :data="tableDtl"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column prop="base_bill_code" label="订单号" width="150" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="批次" width="150" align="center" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column prop="base_unit_name" label="单位" align="center" />
+        <el-table-column prop="unit_weight" label="单重" align="center" />
+        <el-table-column prop="storagevehicle_code" label="载具号" align="center" />
+        <el-table-column prop="struct_code" label="分配货位" align="center" />
+        <el-table-column prop="task_id" label="任务号" align="center" />
+        <el-table-column prop="work_status" label="任务状态" align="center" />
+      </el-table>
+    </el-card>
  </el-dialog>
 </template>

 <script>
-import CRUD, { crud, form } from '@crud/crud'
-import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
-import MaterDtl from '@/views/wms/pub/MaterDialog'

-const defaultForm = {
-  bill_code: '',
-  product_code: 'A1',
-  bill_status: '1',
-  total_qty: '0',
-  detail_count: '0',
-  bill_type: '',
-  remark: '',
-  biz_date: new Date(),
-  create_mode: '',
-  tableData: []
-}
+import { crud } from '@crud/crud'
+import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'

 export default {
-  name: 'AddDialog',
-  components: { MaterDtl },
-  mixins: [crud(), form(defaultForm)],
-  dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
-  cruds() {
-    return CRUD({ title: '入库新增', crudMethod: { ...crudsemiproductIn }})
-  },
+  name: 'ViewDialog',
+  components: { },
+  mixins: [crud()],
+  dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS'],
  props: {
    dialogShow: {
      type: Boolean,
      default: false
    },
-    openParam: {
+    rowmst: {
      type: Object
    }
  },
  data() {
    return {
      dialogVisible: false,
-      materShow: false,
-      dtlShow: false,
-      opendtlParam: null,
-      materType: '03', // 关键成品
-      storlist: [],
+      tableDtl: [],
+      tabledis: [],
      billtypelist: [],
-      rules: {
-        product_code: [
-          { required: true, message: '生产车间不能为空', trigger: 'blur' }
-        ],
-        bill_type: [
-          { required: true, message: '业务类型不能为空', trigger: 'blur' }
-        ],
-        biz_date: [
-          { required: true, message: '业务日期不能为空', trigger: 'blur' }
-        ]
-      }
+      storlist: [],
+      currentdtl: null,
+      currentDis: {},
+      form: {}
    }
  },
  watch: {
    dialogShow: {
-      handler(newValue, oldValue) {
+      handler(newValue) {
        this.dialogVisible = newValue
      }
+    },
+    rowmst: {
+      handler(newValue) {
+        this.form = newValue
+      }
    }
  },
  methods: {
    open() {
-      crudsemiproductIn.queryStor().then(res => {
-        this.storlist = res.content
-      })
+      this.queryTableDtl()
    },
    close() {
-      this.$emit('AddChanged')
+      this.$emit('update:dialogShow', false)
+      this.currentDis = {}
+      this.currentdtl = null
+      this.tableDtl = []
+      this.$emit('TaskChanged')
    },
-    [CRUD.HOOK.afterToEdit]() {
-      // 获取入库单明细
+    stateFormat(row, column) {
+      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+    },
+    taskdtl_typeFormat(row) {
+      return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
+    },
+    task_statusFormat(row) {
+      return this.dict.label.task_status[row.task_status]
+    },
+    work_statusFormat(row) {
+      return this.dict.label.work_status[row.work_status]
+    },
+    handleDtlCurrentChange(current) {
+      if (current !== null) {
+        this.tabledis = []
+        this.currentdtl = current
+        this.queryTableDdis()
+      } else {
+        this.tabledis = []
+        this.currentdtl = {}
+      }
+    },
+    invtypeFormat(row, column) {
+      for (const item of this.billtypelist) {
+        if (item.code === row.source_bill_type) {
+          return item.name
+        }
+      }
+    },
+    handleDisCurrentChange(current) {
+      this.currentDis = current
+    },
+    queryTableDtl() {
      crudsemiproductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
-    },
-    [CRUD.HOOK.afterToView]() {
-      crudsemiproductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
-        this.form.tableData = res.content
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
-    },
-
-    [CRUD.HOOK.beforeSubmit]() {
-      // 提交前校验
-      if (this.form.tableData.length === 0) {
-        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-
-      for (let i = 0; i < this.form.tableData.length; i++) {
-        const row = this.form.tableData[i]
-        if (!row.base_bill_code) {
-          this.crud.notify('订单号', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!row.plan_qty) {
-          this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!this.form.stor_id) {
-          this.crud.notify('所属仓库不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!this.form.point_code) {
-          this.crud.notify('入库点不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!row.storagevehicle_code) {
-          this.crud.notify('载具不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!row.unit_weight) {
-          this.crud.notify('单重不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-      }
-    },
-    deleteRow(index, rows) {
-      const material_code = rows[index].material_code
-      let len = rows.length
-      while (len--) {
-        const obj = rows[len]
-        if (material_code === obj.material_code) {
-          const index = rows.indexOf(obj)
-          if (index > -1) { // 移除找到的指定元素
-            this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
-            rows.splice(index, 1)
-            this.form.detail_count = this.form.tableData.length
-          }
-        }
-      }
-    },
-    tableChanged(rows) {
-      // 对新增的行进行校验不能存在相同物料批次
-      rows.forEach((item) => {
-        let same_mater = true
-        this.form.tableData.forEach((row) => {
-          if (row.material_code === item.material_code) {
-            same_mater = false
-          }
-        })
-        if (same_mater) {
-          item.quality_scode = '01'
-          item.ivt_level = '01'
-          item.is_active = '1'
-          item.plan_qty = '1'
-          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
-          this.form.tableData.splice(-1, 0, item)
-        }
-      })
-      this.form.detail_count = this.form.tableData.length
-    },
-    insertEvent(row) {
-      this.materShow = true
-    },
-    changeQty() {
-      this.form.total_qty = 0
-      this.form.tableData.forEach((item) => {
-        this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+        this.tableDtl = res
      })
    }
  }
@@ -398,13 +227,23 @@ export default {

 <style>
 .crud-opts2 {
-  padding: 4px 0;
+  padding: 0;
  display: -webkit-flex;
  display: flex;
  align-items: center;
 }

-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
 }
+
+.crud-opts2 .role-span2 {
+  padding: 0px 0px 20px 0px;
+}
+.crud-opts2 {
+  padding: 10px 0px 0px 50px;
+}
+
 </style>