rev:提交aps相关代码

mes/qd/src/views/wms/pcs/purchaseorder/AddDialog.vue

@@ -1,25 +1,25 @@
 <!--suppress ALL -->
 <template>
   <el-dialog
+    :before-close="crud.cancelCU"
     :title="crud.status.title"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
     append-to-body
     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 />
+        <span/>
       </el-col>
       <el-col :span="4">
         <span>
           <el-button
+            :loading="crud.cu === 2"
             icon="el-icon-check"
             size="mini"
-            :loading="crud.cu === 2"
             type="primary"
             @click="crud.submitCU"
           >保存</el-button>
@@ -30,22 +30,22 @@
 
     <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=":"
+      label-width="85px"
+      size="mini"
+      style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
     >
       <el-form-item label="车间" prop="workshop_id">
         <label slot="label">车间</label>
         <el-select
           v-model="form.workshop_id"
-          clearable
-          size="mini"
-          placeholder="全部"
           class="filter-item"
+          clearable
+          placeholder="全部"
+          size="mini"
         >
           <el-option
             v-for="item in dict.product_area"
@@ -55,16 +55,26 @@
           />
         </el-select>
       </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-form-item label="原料编码" prop="material_code">
+        <el-input v-model.trim="form.material_code" class="input-with-select" disabled style="width: 210px;">
+          <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-form-item label="原料名称" prop="material_name">
+        <label slot="label">原料名称:</label>
+        <el-input v-model="form.material_name" disabled size="mini" style="width: 210px"/>
       </el-form-item>
-      <el-form-item label="明细数" prop="detail_count">
+      <el-form-item label="选择对应半成品编码" label-width="150px" prop="semireal_code">
+        <el-select v-model="form.semireal_code" size="mini">
+          <el-option
+            v-for="option in codeOptions"
+            :key="option.relation_id"
+            :label="option.semireal_code"
+            :value="option.semireal_code"
+          />
+        </el-select>
+      </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-form-item>
@@ -91,94 +101,94 @@
       </el-form-item>
     </el-form>
 
-    <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-    <div class="crud-opts2" style="margin-bottom: 5px;">
+    <!-如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <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"
           size="mini"
+          type="primary"
           @click="add"
         >
           新增一行
         </el-button>
       </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" />
+      </div>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="form.tableData"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" type="index" width="55"/>
 
-      <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
-            v-model="form.tableData[scope.$index].ask_time"
-            type="date"
-            placeholder="选择日期"
-            align="center"
-            value-format="yyyy-MM-dd"
-            :disabled="crud.status.view > 0"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="qty" label="需求数量">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model.number="form.tableData[scope.$index].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="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
-            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>
+        <el-table-column label="物料编码" prop="material_code" show-overflow-tooltip/>
+        <el-table-column label="物料名称" prop="material_name" show-overflow-tooltip/>
+        <el-table-column label="要求到货日期" prop="ask_time" show-overflow-tooltip style="width: 250px">
+          <template slot-scope="scope">
+            <el-date-picker
+              v-model="form.tableData[scope.$index].ask_time"
+              :disabled="crud.status.view > 0"
+              align="center"
+              placeholder="选择日期"
+              type="date"
+              value-format="yyyy-MM-dd"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="需求重量" prop="show_qty" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input-number
+              v-model.number="form.tableData[scope.$index].show_qty"
+              :controls="false"
+              :min="0"
+              :precision="3"
+              controls-position="right"
+              size="small"
+              @change="changeQty"
+            />
+          </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 label="数量单位" prop="qty_unit_name" show-overflow-tooltip>
+          <template scope="scope">
+            KG
+          </template>
+        </el-table-column>
+        <el-table-column v-if="crud.status.cu > 0" align="center" fixed="right" label="操作" width="100">
+          <template scope="scope">
+            <el-button
+              class="filter-item"
+              icon="el-icon-delete"
+              size="mini"
+              type="danger"
+              @click.native.prevent="deleteRow(scope.$index, form.tableData)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
 
     <MaterDtl
       :dialog-show.sync="materShow"
       :is-single="true"
       @setMaterValue="tableChanged"
     />
-
   </el-dialog>
 </template>
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
-import MaterDtl from '@/views/wms/pub/MaterDialog'
+import MaterDtl from '@/views/wms/pub/rawMaterDialog'
 import crudPurchase from '@/views/wms/pcs/purchaseorder/purchase'
 
 const defaultForm = {
@@ -187,11 +197,13 @@ const defaultForm = {
   create_mode: '01',
   material_code: '',
   material_name: '',
-  qty_unit_id: '1',
+  semireal_code: '',
+  semi_material_name: '',
+  qty_unit_id: '',
   qty_unit_name: 'KG',
   total_qty: 0,
   detail_count: '0',
-  workshop_id: '',
+  workshop_id: 'A1',
   tableData: []
 }
 
@@ -209,6 +221,7 @@ export default {
       sect_id: '',
       opendtlParam: null,
       sects: [],
+      codeOptions: [],
       rules: {
         product_code: [
           { required: true, message: '生产车间不能为空', trigger: 'blur' }
@@ -247,10 +260,17 @@ export default {
         this.crud.notify('车间不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
-
+      if (!this.form.material_code) {
+        this.crud.notify('原料编码不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (!this.form.semireal_code) {
+        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.qty || row.qty === 0) {
+        if (!row.show_qty || row.show_qty === 0) {
           this.crud.notify('数量不能为0', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
@@ -272,13 +292,23 @@ export default {
       }
     },
     tableChanged(item) {
-      this.form.qty_unit_id = '1'
-      this.form.qty_unit_name = 'KG'
+      this.queryCode(item.material_code)
+      this.form.qty_unit_id = item.base_unit_id
+      this.form.qty_unit_name = item.base_unit_name
       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)
     },
+    async queryCode(materialCode) {
+      try {
+        const response = await crudPurchase.getSemiRealCode(materialCode)
+        this.codeOptions = response
+      } catch (error) {
+        debugger;
+        console.error('Error fetching data:', error)
+      }
+    },
     add() {
       if (!this.form.material_code) {
         this.crud.notify('请选择一种物料进行新增！', CRUD.NOTIFICATION_TYPE.INFO)
@@ -289,12 +319,15 @@ export default {
       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, 'show_qty', null)
       this.form.tableData.splice(-1, 0, row)
     },
     insertEvent() {
       this.materShow = true
     },
+    insertEvent2() {
+      this.materShow2 = true
+    },
     insertBill(row) {
       this.billShow = true
     },

mes/qd/src/views/wms/pcs/purchaseorder/index.vue

@@ -9,17 +9,17 @@
           :inline="true"
           class="demo-form-inline"
           label-position="right"
-          label-width="80px"
           label-suffix=":"
+          label-width="80px"
         >
 
           <el-form-item label="车间">
             <el-select
               v-model="query.workshop_id"
-              clearable
-              size="mini"
-              placeholder="全部"
               class="filter-item"
+              clearable
+              placeholder="全部"
+              size="mini"
               @change="crud.toQuery"
             >
               <el-option
@@ -33,44 +33,27 @@
           <el-form-item label="需求日期">
             <el-date-picker
               v-model="query.createTime"
+              :default-time="['00:00:00', '23:59:59']"
+              align="center"
+              end-placeholder="结束日期"
+              start-placeholder="开始日期"
               type="daterange"
               value-format="yyyy-MM-dd HH:mm:ss"
-              align="center"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
               @change="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="状态">
-            <el-select
-              v-model="query.bill_status"
-              clearable
-              size="mini"
-              placeholder="单据状态"
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.IO_BILL_STATUS"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <el-form-item label="生成方式">
             <el-select
               v-model="query.create_mode"
+              class="filter-item"
               clearable
               filterable
-              size="mini"
               placeholder="生成方式"
-              class="filter-item"
+              size="mini"
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.ST_INV_CREATE"
+                v-for="item in dict.ST_CREATE_MODE"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -80,24 +63,24 @@
           <el-form-item label="物料">
             <el-input
               v-model="query.material_search"
-              size="mini"
               clearable
               placeholder="编码、名称"
+              size="mini"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <rrOperation />
+          <rrOperation/>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
         <el-button
           slot="right"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-check"
           :disabled="crud.selections.length === 0"
+          class="filter-item"
+          icon="el-icon-check"
           size="mini"
+          type="warning"
           @click="commit(crud.selections)"
         >
           提交采购
@@ -107,31 +90,29 @@
       <el-table
         ref="table"
         v-loading="crud.loading"
-        size="mini"
         :data="crud.data"
+        :summary-method="getSummaries"
         highlight-current-row
         show-summary
-        :summary-method="getSummaries"
+        size="mini"
         style="width: 100%;"
         @select-all="crud.selectAllChange"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55" />
-        <el-table-column show-overflow-tooltip prop="workshop_id" label="车间" />
-        <el-table-column show-overflow-tooltip prop="material_code" width="130" label="物料编号"/>
-        <el-table-column show-overflow-tooltip prop="material_name" width="130" label="物料名称"/>
-        <el-table-column prop="ask_time" label="要求到货日期" width="130" show-overflow-tooltip />
-        <el-table-column show-overflow-tooltip prop="qty" min-width="120" label="重量"/>
-<!--        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="安全库存" />-->
-<!--        <el-table-column label="总重量" align="center" prop="total_qty"/>-->
-        <el-table-column label="状态" align="center" prop="status" :formatter="stateFormat"/>
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="生成方式" align="center" prop="create_mode" :formatter="createModeFormat"/>
-        <el-table-column label="创建人" align="center" prop="create_name" width="150" />
-        <el-table-column label="创建时间" align="center" prop="create_time" width="150" />
-        <el-table-column label="提交人" align="center" prop="audit_namne" width="150" />
-        <el-table-column label="提交时间" align="center" prop="audit_time" width="140px" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column label="车间" prop="workshop_id" show-overflow-tooltip/>
+        <el-table-column label="物料编号" prop="material_code" show-overflow-tooltip width="130"/>
+        <el-table-column :min-width="flexWidth('material_name', crud.data, '物料名称')" label="物料名称" prop="material_name" show-overflow-tooltip/>
+        <el-table-column :min-width="flexWidth('ask_time', crud.data, '要求到货日期')" label="要求到货日期" prop="askTime"/>
+        <el-table-column label="重量" min-width="120" prop="show_qty" show-overflow-tooltip/>
+        <!--        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="安全库存" />-->
+        <!--        <el-table-column label="总重量" align="center" prop="total_qty"/>-->
+        <el-table-column :formatter="stateFormat" align="center" label="状态" prop="status"/>
+        <el-table-column :formatter="createModeFormat" align="center" label="生成方式" prop="create_mode" width="110"/>
+        <el-table-column align="center" label="创建人" prop="create_name" width="150"/>
+        <el-table-column align="center" label="创建时间" prop="createTime" width="150"/>
+        <el-table-column align="center" label="备注" prop="remark"/>
+        <el-table-column v-permission="[]" align="center" fixed="right" label="操作" width="120px">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
@@ -141,9 +122,9 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
-    <AddDialog @AddChanged="querytable" />
+    <AddDialog @AddChanged="querytable"/>
   </div>
 </template>
 
@@ -169,7 +150,7 @@ export default {
       query: {
         'status': '0'
       },
-      url: '/api/pcsIfPurchaseorder',
+      url: '/api/pcsIfPurchaseorder/query',
       crudMethod: { ...crudPurchase }
     })
   },
@@ -203,27 +184,27 @@ export default {
   },
   methods: {
     getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
+      const { columns, data } = param
+      const sums = []
       columns.forEach((column, index) => {
         if (index === 0) {
-          sums[index] = '合计';
-          return;
+          sums[index] = '合计'
+          return
         }
-        const values = data.map(item => Number(item[column.property]));
-        if (column.property === 'qty') {
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'show_qty') {
           sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
+            const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr;
+              return prev + curr
             } else {
-              return prev;
+              return prev
             }
-          }, 0);
-          sums[index] += ' KG';
+          }, 0)
+          sums[index] = sums[index].toFixed(3) + ' KG'
         }
-      });
-      return sums;
+      })
+      return sums
     },
     bill_typeFormat(row, column) {
       return this.dict.label.ST_INV_RAW_IN_TYPE[row.bill_type]
@@ -247,7 +228,7 @@ export default {
   }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" scoped>
+<style lang="scss" rel="stylesheet/scss" scoped>
 ::v-deep .el-dialog__body {
   padding-top: 10px;
 }

mes/qd/src/views/wms/pcs/purchaseorder/purchase.js

@@ -1,67 +1,76 @@
 import request from '@/utils/request'
 
 export function add(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder',
+        method: 'post',
+        data
+    })
 }
 
 export function del(ids) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/delete',
-    method: 'post',
-    data: ids
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/delete',
+        method: 'post',
+        data: ids
+    })
 }
 
 export function edit(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/update',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/update',
+        method: 'post',
+        data
+    })
 }
 
 export function confirm(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/confirm',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/confirm',
+        method: 'post',
+        data
+    })
 }
 
 export function getDtl(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/getDtl',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/getDemandDtl',
+        method: 'post',
+        data
+    })
+}
+
+export function getSemiRealCode(data) {
+    return request({
+        url: '/api/pcsIfPurchaseorder/getSemiRealCode',
+        method: 'post',
+        data
+    })
 }
 
 export function commit(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/commit',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/commit',
+        method: 'post',
+        data
+    })
 }
 
 export function excelImport(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/excelImport',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/excelImport',
+        method: 'post',
+        data
+    })
 }
 
 export default {
-  add,
-  edit,
-  del,
-  confirm,
-  getDtl,
-  commit,
-  excelImport
+    add,
+    edit,
+    del,
+    confirm,
+    getDtl,
+    commit,
+    excelImport,
+    getSemiRealCode
 }