1.生产入库实现45%

loulijun2021

2023-05-31 f3c578b9ed1d5f6b6271d3c03f9d30352a9c2c2c

1.生产入库实现45%

 src/api/produceManager.js

@@ -444,3 +444,11 @@
    data
  })
}

export function ProductInHouseWkshopOrder(data) {
  return request({
    url: 'ProductionManagement/ProductInHouseWkshopOrder',
    method: 'get',
    params: data
  })
}

 src/views/produceManager/productWarehouse.vue

@@ -29,14 +29,14 @@
        >
          <div class="elForm" style="display: flex;flex-direction: column">
            <div style="display: flex">
              <el-form-item label="单据类型" style=" display: flex;">
              <el-form-item label="单据类型" required style=" display: flex;">
                <el-select
                  v-model="form.documentType"
                  :popper-append-to-body="false"
                  filterable
                  style="width: 200px"
                  placeholder="请选择"
                  @change="getProductInHouseOrderSearch"
                  @change="documentTypeChange"
                >
                  <el-option
                    v-for="item in documentTypeArr"
@@ -46,19 +46,82 @@
                  />
                </el-select>
              </el-form-item>
              <el-form-item label="生产车间" required style=" display: flex;">
                <el-select
                  v-model="form.wkshopcode"
                  :popper-append-to-body="false"
                  filterable
                  style="width: 200px"
                  placeholder="请选择"
                  @change="wkshopcodeChange"
                >
                  <el-option
                    v-for="item in WorkShopArr"
                    :key="item.code"
                    :label="item.name"
                    :value="item.code"
                  />
                </el-select>
              </el-form-item>
              <el-form-item
                v-if="form.documentType==='Y'"
                label="生产订单"
                :required="form.documentType==='Y'"
                style=" display: flex;"
              >
                <el-input

                <el-select
                  v-model="form.erpordercode"
                  placeholder="请输入"
                  :popper-append-to-body="false"
                  filterable
                  style="width: 200px"
                  @input="getProductInHouseOrderSearch"
                />
                  placeholder="请选择"
                  @change="getProductInHouseOrderSearch"
                >
                  <el-option
                    v-for="item in erpordercodeArr"
                    :key="item.ordercode"
                    :label="item.ordercode"
                    :value="item.ordercode"
                  />
                </el-select>

                <!--                <el-input-->
                <!--                  v-model="form.erpordercode"-->
                <!--                  placeholder="请输入"-->
                <!--                  style="width: 200px"-->
                <!--                  @input="getProductInHouseOrderSearch"-->
                <!--                />-->
              </el-form-item>
              <el-form-item label="生产工单" style=" display: flex;">

              <el-form-item
                v-if="form.documentType==='N'"
                label="生产工单"
                :required="form.documentType==='N'"
                style=" display: flex;"
              >
                <el-select
                  v-model="form.mesordercode"
                  :popper-append-to-body="false"
                  filterable
                  style="width: 200px"
                  placeholder="请选择"
                  @change="getProductInHouseOrderSearch"
                >
                  <el-option
                    v-for="item in mesordercodeArr"
                    :key="item.ordercode"
                    :label="item.ordercode"
                    :value="item.ordercode"
                  />
                </el-select>
              </el-form-item>

              <el-form-item
                v-if="form.documentType==='Y'"
                label="生产工单"
                style=" display: flex;"
              >
                <el-input
                  v-model="form.mesordercode"
                  placeholder="请输入"
@@ -71,7 +134,12 @@
                label="销售订单"
                style="display: flex;"
              >
                <el-input v-model="form.saleOrderCode" placeholder="请输入" style="width: 200px" @input="getProductInHouseOrderSearch" />
                <el-input
                  v-model="form.saleOrderCode"
                  readonly
                  style="width: 200px"
                />
                <!--                disabled-->
              </el-form-item>
            </div>

@@ -106,8 +174,9 @@
          </div>
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <!--            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"-->

            <!--            <el-button v-waves type="primary" icon="el-icon-search" @click="search">查询</el-button>-->
            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
@@ -136,25 +205,12 @@
                style="width: 200px"
                type="date"
                placeholder="选择日期"
              />            </el-form-item>
              />
            </el-form-item>
            <el-form-item label="单据编号" style=" display: flex;">
              <el-input v-model="form.OrgName" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="生产车间" style=" display: flex;">
              <el-select
                v-model="form.WorkShop"
                :popper-append-to-body="false"
                filterable
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in WorkShopArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>            </el-form-item>

            <el-form-item label="入库仓库" style=" display: flex;">
              <el-select
                v-model="form.stockcode"
@@ -162,6 +218,7 @@
                filterable
                style="width: 200px"
                placeholder="请选择"
                @change="stockcodeChange"
              >
                <el-option
                  v-for="item in stockcodeArr"
@@ -173,8 +230,11 @@
            </el-form-item>

          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <el-button v-waves type="primary" icon="el-icon-s-promotion" @click="search">入库提交</el-button>
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <el-button v-waves type="primary" icon="el-icon-s-promotion" @click="submit">入库提交</el-button>
            <!--            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>-->
          </div>
        </el-form>
@@ -196,7 +256,7 @@
          <!--            @click=""-->
          <!--          >入库提交-->
          <!--          </el-button>-->
          <el-tabs style="margin-top: 10px;">
          <el-tabs style="margin-top: 10px;" @tab-click="tabClick">
            <el-tab-pane label="明细">
              <div class="elTableDiv" style="margin: 0 auto 10px;">
                <el-table
@@ -212,6 +272,8 @@
                  :header-cell-style="this.$headerCellStyle"
                  :cell-style="this.$cellStyle"
                  @selection-change="handleSelectionChange"
                  @cell-dblclick="cellDblclick"
                  @cell-click="cellClick"
                >
                  <el-table-column
                    type="selection"
@@ -226,13 +288,29 @@
                  />

                  <el-table-column
                    prop="stockname"
                    prop="stockcode"
                    label="仓库"
                    width="110"
                    width="160"
                    show-tooltip-when-overflow
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.stockname">{{ row.stockname }}</div>
                      <div v-else>/</div>
                      <div
                        v-if="!(row.index === tabClickIndex && tabClickLabel === '仓库')"
                      >
                        {{ row.stockcode ? stockcodeArr.find(i => i.code === row.stockcode).name : '/' }}
                      </div>
                      <el-select
                        v-if="row.index === tabClickIndex && tabClickLabel === '仓库'"
                        v-model="row.stockcode"
                        placeholder="请选择"
                      >
                        <el-option
                          v-for="item in stockcodeArr"
                          :key="item.code"
                          :label="item.name"
                          :value="item.code"
                        />
                      </el-select>
                    </template>
                  </el-table-column>
                  <el-table-column
@@ -277,7 +355,7 @@
                    show-tooltip-when-overflow
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.stockname">{{ row.stockname }}</div>
                      <div v-if="row.partspec">{{ row.partspec }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>
@@ -318,10 +396,25 @@
                  <el-table-column
                    prop="stinhouseqty"
                    label="可入库数量"
                    min-width="95"
                    min-width="130"
                    fixed="right"
                    show-tooltip-when-overflow
                  />
                  >
                    <template slot-scope="{row}">
                      <el-input-number v-model="row.stinhouseqty" :max="row.good_qty" size="small" />

                      <!--                      <div-->
                      <!--                        v-if="!(row.index === tabClickIndex && tabClickLabel === '可入库数量')"-->
                      <!--                      >-->
                      <!--                        {{ row.stinhouseqty }}-->
                      <!--                      </div>-->
                      <!--                      <el-input-->
                      <!--                        v-if="row.index === tabClickIndex && tabClickLabel === '可入库数量'"-->
                      <!--                        v-model="row.stinhouseqty"-->
                      <!--                        oninput="value=value.replace(/[^0-9]/g,'')"-->
                      <!--                      />-->

                    </template>
                  </el-table-column>
                </el-table>
                <el-table
                  v-show="form.documentType==='N'"
@@ -358,6 +451,7 @@
                      <div v-if="row.stockname">{{ row.stockname }}</div>
                      <div v-else>/</div>
                    </template>

                  </el-table-column>
                  <el-table-column
                    prop="inbarcode"
@@ -449,7 +543,127 @@
                </el-table>
              </div>
            </el-tab-pane>
            <el-tab-pane label="汇总">汇总</el-tab-pane>
            <el-tab-pane label="汇总">
              <div class="elTableDiv" style="margin: 0 auto 10px;">
                <el-table
                  ref="tableDataRef"
                  class="tableFixed"
                  :data="tableDataSummary"
                  :height="(tableHeight-25)+'px'"
                  border
                  :row-class-name="tableRowClassName2"
                  :style="{width: 100+'%',height:(tableHeight-25)+'px',}"
                  highlight-current-row
                  :header-cell-style="this.$headerCellStyle"
                  :cell-style="this.$cellStyle"
                >
                  <el-table-column
                    type="index"
                    width="50"
                    fixed
                    label="序号"
                  />
                  <!--                  <el-table-column-->
                  <!--                    prop="stockname"-->
                  <!--                    label="仓库"-->
                  <!--                    width="110"-->
                  <!--                  >-->
                  <!--                    <template slot-scope="{row}">-->
                  <!--                      <div v-if="row.stockname">{{ row.stockname }}</div>-->
                  <!--                      <div v-else>/</div>-->
                  <!--                    </template>-->

                  <!--                  </el-table-column>-->
                  <!--                  <el-table-column-->
                  <!--                    prop="inbarcode"-->
                  <!--                    label="入库条码"-->
                  <!--                    width="160"-->
                  <!--                    show-tooltip-when-overflow-->
                  <!--                  />-->
                  <!--                  <el-table-column-->
                  <!--                    prop="m_po"-->
                  <!--                    label="订单编号"-->
                  <!--                    width="160"-->
                  <!--                    show-tooltip-when-overflow-->
                  <!--                  >-->
                  <!--                    <template slot-scope="{row}">-->
                  <!--                      <div v-if="row.m_po">{{ row.m_po }}</div>-->
                  <!--                      <div v-else>/</div>-->
                  <!--                    </template>-->
                  <!--                  </el-table-column>-->
                  <!--                  <el-table-column-->
                  <!--                    prop="wo_code"-->
                  <!--                    label="工单编号"-->
                  <!--                    width="160"-->
                  <!--                    show-tooltip-when-overflow-->
                  <!--                  />-->
                  <el-table-column
                    prop="partcode"
                    label="产品编码"
                    min-width="160"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="partname"
                    label="产品名称"
                    min-width="160"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="partspec"
                    label="产品规格"
                    min-width="160"
                    show-tooltip-when-overflow
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.stockname">{{ row.stockname }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>

                  <el-table-column
                    prop="qty"
                    label="订单数量"
                    min-width="95"

                    show-tooltip-when-overflow
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.qty">{{ row.qty }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>
                  <!--                  <el-table-column-->
                  <!--                    prop="plan_qty"-->
                  <!--                    label="工单数量"-->
                  <!--                    min-width="95"-->
                  <!--                    fixed="right"-->
                  <!--                    show-tooltip-when-overflow-->
                  <!--                  />-->
                  <el-table-column
                    prop="good_qty"
                    label="完工数量"
                    min-width="95"

                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="inhouseqty"
                    label="已入库数量"
                    min-width="95"

                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="stinhouseqty"
                    label="可入库数量"
                    min-width="95"

                    show-tooltip-when-overflow
                  />
                </el-table>
              </div>
            </el-tab-pane>
          </el-tabs>
        </div>

@@ -464,9 +678,10 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { WareHouseSelect } from '@/api/materialManager'
import { ProductInHouseOrderSearch } from '@/api/produceManager'
import { ProductInHouseOrderSearch, ProductInHouseWkshopOrder } from '@/api/produceManager'
import { handleDatetime } from '@/utils/global'
import { WorkShopSelect } from '@/api/deviceManager'
import $ from 'jquery'

export default {
  name: 'Zzjg',
@@ -479,6 +694,7 @@
      form: {
        documentType: 'Y', // 单据类型

        wkshopcode: '', // 生产车间
        erpordercode: '', // 订单编号
        mesordercode: '', // 工单编号
        partcode: '', // 产品编码
@@ -487,19 +703,25 @@
        orderdate: '', // 工单日期

        saleOrderCode: '', // 销售订单
        WorkShop: '', // 生产车间
        lm_date: '', // 单据日期
        stockcode: '', // 入库仓库
        xxx: ''
        stockcode: '' // 入库仓库

      },
      documentTypeArr: [
        { label: '有源单', value: 'Y' },
        { label: '无源单', value: 'N' }
      ],
      tableDataDetail: [],
      tableDataDetail: [], // 明细表
      multipleSelection: [],
      stockcodeArr: [], // 入库仓库数组
      WorkShopArr: [], // 生产车间数组
      erpordercodeArr: [], // 生产订单数组
      mesordercodeArr: [], // 生产工单数组

      tabClickIndex: null, // 点击的单元格
      tabClickLabel: '', // 当前点击的列名

      tableDataSummary: [], // 汇总表

      xxx: ''

@@ -507,27 +729,43 @@
  },
  watch: {},
  created() {
    this.handleRequest()
    this.getWareHouseSelect()
    this.getWorkShopSelect()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    handleRequest() {
      this.getProductInHouseOrderSearch().then(res => {
        if (res.code === '200') {
          this.getWareHouseSelect()
          this.getWorkShopSelect()
        }
      })
    // 单据类型改变
    documentTypeChange(val) {
      this.form.erpordercode = ''
      this.form.wkshopcode = ''
    },
    async  getProductInHouseOrderSearch() {
    // 生产车间改变
    async wkshopcodeChange(val) {
      this.form.erpordercode = ''
      this.form.mesordercode = ''
      this.form.saleOrderCode = ''
      const data = {
        ordertype: this.form.documentType,
        wkshopcode: val
      }
      const { data: res } = await ProductInHouseWkshopOrder(data)
      if (this.form.documentType === 'Y') {
        this.erpordercodeArr = res
      } else {
        this.mesordercodeArr = res
      }
    },

    async getProductInHouseOrderSearch() {
      let tempDate = this.form.orderdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode, // 生产车间
        erpordercode: this.form.erpordercode, // 订单编号
        mesordercode: this.form.mesordercode, // 工单编号
        partcode: this.form.partcode, // 产品编码
@@ -541,10 +779,11 @@
      // 根据原单做过滤
      this.tableDataDetail = res.data.filter(i => this.form.documentType === 'Y' ? i.m_po : !i.m_po)

      this.form.saleOrderCode = res.data[0].saleOrderCode

      this.$nextTick(() => {
        this.$refs.tableDataRef.doLayout()
      })
      return { code: res.code }
    },
    // 获取仓库接口
    async getWareHouseSelect() {
@@ -559,17 +798,210 @@

    // 重置
    reset() {
      this.form.OrgCode = ''
      this.form.OrgName = ''
      this.form.OrgType = ''
      this.form.UserName = ''
      this.getOrganizationSearch()
      this.form.wkshopcode = ''
      this.form.erpordercode = ''
      this.form.mesordercode = ''
      this.form.partcode = ''
      this.form.partname = ''
      this.form.partspec = ''
      this.form.orderdate = ''

      this.tableDataDetail = []
    },

    // 表格单元格双击
    cellDblclick(row, column, cell, event) {
      switch (column.label) {
        case '仓库':
          this.tabClickIndex = row.index
          this.tabClickLabel = column.label
          break
        case '可入库数量':
          this.tabClickIndex = row.index
          this.tabClickLabel = column.label
          break
        // case '判责金额(元)':
        //   this.tabClickIndex = row.index
        //   this.tabClickLabel = column.label
        //   break
        default:
          return
      }
    },
    // 表格单击事件
    cellClick() {
      this.tabClickLabel = ''
    },
    // 入库仓库值改变
    stockcodeChange(val) {
      this.tableDataDetail.forEach(i => {
        i.stockcode = val
      })
    },

    // 多选选中
    handleSelectionChange(val) {
      this.multipleSelection = val
    },

    // tab点击
    tabClick(val) {
      console.log(val.label)
      // this.$nextTick(() => {
      //   this.$refs.tableDataRef.doLayout()
      // })

      const data = [
        {
          'inbarcode': 'IN23053150',
          'saleOrderid': 13,
          'saleOrderCode': 'SO-2023-05-0009',
          'saleOrderDetailId': 19,
          'mpoid': 19,
          'm_po': 'MO-2023-05-0007',
          'sbid': 30,
          'wo_code': 'MO-2023-05-0007_4',
          'materiel_id': 11,
          'partcode': '301',
          'partname': '电脑',
          'partspec': '',
          'step_code': 'Step08',
          'wkshp_id': 1,
          'wkshp_code': 'CJ001',
          'stck_id': 3,
          'stockcode': '03',
          'stockname': '成品仓库',
          'qty': 80.00,
          'plan_qty': 40.0,
          'good_qty': 20.00,
          'inhouseqty': 0.00,
          'stinhouseqty': 20.00,
          'lm_date': '2023-05-31 09:52:24',
          'style': 'S'
        },
        {
          'inbarcode': 'IN23053148',
          'saleOrderid': 13,
          'saleOrderCode': 'SO-2023-05-0009',
          'saleOrderDetailId': 19,
          'mpoid': 19,
          'm_po': 'MO-2023-05-0007',
          'sbid': 30,
          'wo_code': 'MO-2023-05-0007_3',
          'materiel_id': 11,
          'partcode': '301',
          'partname': '电脑',
          'partspec': '',
          'step_code': 'Step08',
          'wkshp_id': 1,
          'wkshp_code': 'CJ001',
          'stck_id': 3,
          'stockcode': '03',
          'stockname': '成品仓库',
          'qty': 80.00,
          'plan_qty': 40.0,
          'good_qty': 1.00,
          'inhouseqty': 0.00,
          'stinhouseqty': 1.00,
          'lm_date': '2023-05-31 09:52:31',
          'style': 'S'
        },
        {
          'inbarcode': 'IN23053149',
          'saleOrderid': 13,
          'saleOrderCode': 'SO-2023-05-0009',
          'saleOrderDetailId': 19,
          'mpoid': 19,
          'm_po': 'MO-2023-05-0007',
          'sbid': 30,
          'wo_code': 'MO-2023-05-0007_3',
          'materiel_id': 11,
          'partcode': '301',
          'partname': '电脑',
          'partspec': '',
          'step_code': 'Step08',
          'wkshp_id': 1,
          'wkshp_code': 'CJ001',
          'stck_id': 3,
          'stockcode': '03',
          'stockname': '成品仓库',
          'qty': 80.00,
          'plan_qty': 40.0,
          'good_qty': 9.00,
          'inhouseqty': 0.00,
          'stinhouseqty': 9.00,
          'lm_date': '2023-05-31 09:52:31',
          'style': 'S'
        },
        {
          'inbarcode': 'IN23053145',
          'saleOrderid': 13,
          'saleOrderCode': 'SO-2023-05-0009',
          'saleOrderDetailId': 20,
          'mpoid': 19,
          'm_po': 'MO-2023-05-0007',
          'sbid': 31,
          'wo_code': 'MO-2023-05-0007_5',
          'materiel_id': 24,
          'partcode': '308',
          'partname': '电池包',
          'partspec': '',
          'step_code': 'Step08',
          'wkshp_id': 1,
          'wkshp_code': 'CJ001',
          'stck_id': 2,
          'stockcode': '02',
          'stockname': '半成品库',
          'qty': 70.00,
          'plan_qty': 70.0,
          'good_qty': 5.00,
          'inhouseqty': 0.00,
          'stinhouseqty': 5.00,
          'lm_date': '2023-05-31 09:52:40',
          'style': 'S'
        },
        {
          'inbarcode': 'IN23053147',
          'saleOrderid': 13,
          'saleOrderCode': 'SO-2023-05-0009',
          'saleOrderDetailId': 20,
          'mpoid': 19,
          'm_po': 'MO-2023-05-0007',
          'sbid': 31,
          'wo_code': 'MO-2023-05-0007_5',
          'materiel_id': 24,
          'partcode': '308',
          'partname': '电池包',
          'partspec': '',
          'step_code': 'Step08',
          'wkshp_id': 1,
          'wkshp_code': 'CJ001',
          'stck_id': 2,
          'stockcode': '02',
          'stockname': '半成品库',
          'qty': 70.00,
          'plan_qty': 70.0,
          'good_qty': 10.00,
          'inhouseqty': 0.00,
          'stinhouseqty': 10.00,
          'lm_date': '2023-05-31 09:52:40',
          'style': 'S'
        }
      ]

      const partcodeArr = data.map(i => i.partcode)
      const newData = []
      if (val.label === '汇总') {
        data.forEach(i => {
          // if ()
        })
      }
    },

    // 提交
    submit() {

    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
@@ -579,6 +1011,11 @@
      })
    },
    tableRowClassName({ row, rowIndex }) {
      // 把每一行的索引放进row
      row.index = rowIndex
      return 'custom-row'
    },
    tableRowClassName2({ row, rowIndex }) {
      return 'custom-row'
    }
  }