add:新增半成品出入库导入/清洗刻字调度任务

2023-07-25 17:08:37 +08:00
parent cc2cf779e9
commit 373488ada2
86 changed files with 1748 additions and 517 deletions
--- a/mes/qd/src/api/wms/basedata/st/structattr.js
+++ b/mes/qd/src/api/wms/basedata/st/structattr.js
@@ -31,6 +31,13 @@ export function changeActive(data) {
    data
  })
 }
+export function changeEmp(data) {
+  return request({
+    url: 'api/structattr/changeEmp',
+    method: 'put',
+    data
+  })
+}

 export function getSectCascader(data) {
  return request({
@@ -40,4 +47,4 @@ export function getSectCascader(data) {
  })
 }

-export default { add, edit, del, changeActive, getSectCascader }
+export default { add, edit, del, changeActive, getSectCascader, changeEmp }
--- a/mes/qd/src/views/wms/masterdata_manage/st/struct/index.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/st/struct/index.vue
@@ -224,6 +224,7 @@
              :value="format_is_used(scope.row.is_emptyvehicle)"
              active-color="#409EFF"
              inactive-color="#F56C6C"
+              @change="changeEmp(scope.row)"
            />
          </template>
        </el-table-column>
@@ -470,6 +471,27 @@ export default {
        })
      }).catch(() => {
      })
+    },
+    changeEmp(data) {
+      let msg = '设置该仓位非空载具，是否继续！'
+      if (data.is_emptyvehicle === false) {
+        msg = '设置该仓位为空载具，是否继续！'
+      }
+
+      this.$confirm(msg, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        data.is_emptyvehicle = !data.is_emptyvehicle
+        crudStructattr.changeEmp(data).then(res => {
+          this.crud.toQuery()
+          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          data.is_emptyvehicle = !data.is_emptyvehicle
+        })
+      }).catch(() => {
+      })
    }
  }
 }
--- a/mes/qd/src/views/wms/pcs/deliveryorder/index.vue
+++ b/mes/qd/src/views/wms/pcs/deliveryorder/index.vue
@@ -82,25 +82,94 @@
          </el-form-item>
          <rrOperation :crud="crud"/>
        </el-form>
+
      </div>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
      <crudOperation :permission="permission">
        <el-button
          slot="right"
          class="filter-item"
-          type="success"
-          icon="el-icon-position"
+          type="warning"
+          icon="el-icon-upload2"
          size="mini"
-          @click="importin"
+          @click="uploadShow = true"
        >
-          同步
+          导入
        </el-button>
+<!--        <el-button-->
+<!--          slot="right"-->
+<!--          class="filter-item"-->
+<!--          type="success"-->
+<!--          icon="el-icon-position"-->
+<!--          size="mini"-->
+<!--          @click="importin"-->
+<!--        >-->
+<!--          同步-->
+<!--        </el-button>-->
      </crudOperation>
      <!--表单组件-->
      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
-                 :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+                 :title="crud.status.title">
+        <el-form
+          ref="form"
+          :inline="true"
+          :model="form"
+          label-width="160px"
+          style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+        >
+          <el-form-item label="发货单号" prop="deliver_code">
+            <el-input v-model="form.deliver_code" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="销售单单号" prop="deliver_code">
+            <el-input v-model="form.deliver_code" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="发货单明细" prop="seq_no">
+            <el-input v-model="form.seq_no" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="销售单明细" prop="sale_seq_no">
+            <el-input v-model="form.sale_seq_no" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="发货数量" prop="delivery_qty">
+            <el-input-number v-model="form.delivery_qty" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="计量单位" prop="unit_name">
+            <!-- unit_list-->
+            <el-select v-model="form.qty_unit_id" placeholder="" style="width: 200px">
+              <el-option
+                v-for="item in unit_list"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料编码" prop="material_code">
+            <el-input v-model="form.material_code" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="客户名称" prop="cust_code">
+            <el-select v-model="form.cust_code" placeholder="" style="width: 200px">
+              <el-option
+                v-for="item in customer_list"
+                :key="item.label"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="计划交期时间" prop="plandeliver_date">
+            <el-date-picker
+              v-model="form.plandeliver_date"
+              value-format="yyyy-MM-dd"
+              type="date"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" style="width: 200px;" />
+          </el-form-item>
        </el-form>
+
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px"></el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="text" @click="crud.cancelCU">取消</el-button>
          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
@@ -147,7 +216,11 @@
      <!--分页组件-->
      <pagination/>
    </div>
-    <Dialog :dialog-show.sync="dialogShow"/>
+    <UploadDialog
+      :dialog-show.sync="uploadShow"
+      @tableChanged3="tableChanged3"
+    />
+    <Dialog :dialog-show.sync="dialogShow" />
  </div>
 </template>

@@ -194,7 +267,7 @@ export default {
    return CRUD({
      title: '发货单', url: 'api/deliveryOrder', idField: 'deliver_id', sort: 'deliver_id,desc',
      optShow: {
-        add: false,
+        add: true,
        edit: false,
        del: false,
        reset: true,
@@ -206,9 +279,11 @@ export default {
  data() {
    return {
      classes3: [],
+      uploadShow: false,
      dialogShow: false,
      permission: {},
      rules: {},
+      unit_list: [{ value: 16, label: '个\\只' }],
      queryTypeOptions: [
        {key: 'deliver_code', display_name: '发货单号'}
      ]
@@ -231,6 +306,9 @@ export default {
        })
      })
    },
+    tableChanged3() {
+      this.crud.toQuery()
+    },
    importin() {
      this.dialogShow = true
    },
--- a/mes/qd/src/views/wms/pcs/saleorder/index.vue
+++ b/mes/qd/src/views/wms/pcs/saleorder/index.vue
@@ -152,14 +152,6 @@
              />
            </el-select>
          </el-form-item>
-          <el-form-item label="计划交期时间" prop="plandeliver_date">
-            <el-date-picker
-              v-model="form.plandeliver_date"
-              value-format="yyyy-MM-dd"
-              type="date"
-              style="width: 200px;"
-            />
-          </el-form-item>
          <el-form-item label="备注" prop="remark">
            <el-input v-model="form.remark" style="width: 200px;" />
          </el-form-item>
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue
@@ -25,7 +25,7 @@
    <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-item label="单据号" prop="bill_code">
-        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号2:</label>
        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
      </el-form-item>
      <el-form-item label="仓库" prop="product_code">
@@ -265,7 +265,7 @@ export default {
      materShow: false,
      dtlShow: false,
      opendtlParam: null,
-      materType: '03', // 关键成品
+      materType: '01',
      storlist: [],
      pointList: [],
      billtypelist: [],
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue
@@ -65,7 +65,15 @@
        </el-form>
      </div>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission" >
+        <el-button
+          size="mini"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-download"
+          @click="downloadMethod"
+        >导出</el-button>
+      </crudOperation>
      <!--表格渲染-->
      <el-table
        ref="table"
@@ -110,7 +118,7 @@ export default {
  cruds() {
    return CRUD({
      title: '半成品库存',
-      optShow: { add: false, reset: true },
+      optShow: { add: false,download: true, reset: true },
      idField: 'struct_id',
      url: '/api/bcp',
      crudMethod: { ...semiproductivt }
@@ -138,6 +146,11 @@ export default {
    })
  },
  methods: {
+    downloadMethod() {
+      semiproductivt.exportFile(this.query).then(res => {
+        this.crud.notify('导出成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+    },
  }
 }
 </script>
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/semiproductivt.js
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/semiproductivt.js
@@ -16,6 +16,14 @@ export function del(ids) {
  })
 }

+export function exportFile(data) {
+  return request({
+    url: '/api/stIvtStructivtflowBcp/exportFile',
+    method: 'post',
+    data
+  })
+}
+
 export function edit(data) {
  return request({
    url: '/api/bcp/update',
@@ -27,5 +35,6 @@ export function edit(data) {
 export default {
  add,
  edit,
-  del
+  del,
+  exportFile
 }
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue
@@ -29,6 +29,24 @@
            </el-select>
          </el-form-item>

+          <el-form-item label="业务类型">
+            <el-select
+              v-model="query.bill_type_scode"
+              clearable
+              size="mini"
+              placeholder="变动类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_BCP_IN_OUT_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
          <el-form-item label="变动类型">
            <el-select
              v-model="query.change_type_scode"
@@ -81,7 +99,18 @@
        </el-form>
      </div>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission" >
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-position"
+          size="mini"
+          @click="exportFile()"
+        >
+          导出
+        </el-button>
+      </crudOperation>
      <!--表格渲染-->
      <el-table
        ref="table"
@@ -99,6 +128,7 @@
        <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
        <el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
        <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="bill_type_scode" label="业务类型" :formatter="billType" />
        <el-table-column show-overflow-tooltip min-width="120" prop="change_type_scode" label="变动类型" :formatter="formatType" />
        <el-table-column show-overflow-tooltip min-width="120" prop="bill_code" label="单据号" />
        <el-table-column show-overflow-tooltip min-width="120" prop="change_person_name" label="变动人" />
@@ -125,7 +155,7 @@ import ProductivtFlow from '@/views/wms/storage_manage/semiproduct/semiproductIv

 export default {
  name: 'ProductIn',
-  dicts: ['CHANGE_TYPE_SCODE'],
+  dicts: ['CHANGE_TYPE_SCODE','ST_INV_BCP_IN_OUT_TYPE'],
  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
  cruds() {
    return CRUD({
@@ -157,10 +187,17 @@ export default {
    crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
      this.storlist = res.content
    })
+
  },
  methods: {
    formatType(row) {
      return this.dict.label.CHANGE_TYPE_SCODE[row.change_type_scode]
+    },
+    billType(row) {
+      return this.dict.label.ST_INV_BCP_IN_OUT_TYPE[row.bill_type_scode]
+    },
+    exportFile(){
+      console.log(this.query)
    }
  }
 }