From 666d4f6ad00b7cad1bd03c24b256ed77c56e3aa2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 06 六月 2023 09:04:02 +0800
Subject: [PATCH] 1.生产入库实现70%
---
src/views/produceManager/productWarehouse.vue | 439 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 261 insertions(+), 178 deletions(-)
diff --git a/src/views/produceManager/productWarehouse.vue b/src/views/produceManager/productWarehouse.vue
index 4c94483..c0aa363 100644
--- a/src/views/produceManager/productWarehouse.vue
+++ b/src/views/produceManager/productWarehouse.vue
@@ -19,6 +19,9 @@
<div style="font-size: 14px;margin-left: 5px;color: #a7a7a7">
鏌ヨ椤�
</div>
+ <div v-if="!isPermission" style="font-size: 14px;margin-left: 10px;color: red">
+ 褰撳墠鐢ㄦ埛鍦‥RP绯荤粺涓笉瀛樺湪鎴栨湭鎺堟潈锛屾棤娉曞叆搴撴彁浜�
+ </div>
</div>
<el-form
ref="form"
@@ -67,7 +70,7 @@
v-if="form.documentType==='Y'"
label="鐢熶骇璁㈠崟"
:required="form.documentType==='Y'"
- style=" display: flex;"
+ style="display: flex;"
>
<el-select
@@ -203,12 +206,18 @@
<el-date-picker
v-model="form.lm_date"
style="width: 200px"
+ readonly
type="date"
placeholder="閫夋嫨鏃ユ湡"
/>
</el-form-item>
<el-form-item label="鍗曟嵁缂栧彿" style=" display: flex;">
- <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input
+ v-model="form.hbillno"
+ readonly
+ placeholder="璇疯緭鍏�"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item label="鍏ュ簱浠撳簱" style=" display: flex;">
@@ -234,7 +243,13 @@
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="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>
@@ -399,21 +414,9 @@
min-width="130"
fixed="right"
>
- <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>
+ <!-- <template slot-scope="{row}">-->
+ <!-- <el-input-number v-model="row.stinhouseqty" :min="0" :max="row.good_qty" size="small" />-->
+ <!-- </template>-->
</el-table-column>
</el-table>
<el-table
@@ -563,11 +566,15 @@
fixed
label="搴忓彿"
/>
- <!-- <el-table-column-->
- <!-- prop="stockname"-->
- <!-- label="浠撳簱"-->
- <!-- width="110"-->
- <!-- >-->
+ <el-table-column
+ prop="stockcode"
+ label="浠撳簱"
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div>{{ stockcodeArr.find(i=>i.code===row.stockcode).name }}</div>
+ </template>
+ </el-table-column>
<!-- <template slot-scope="{row}">-->
<!-- <div v-if="row.stockname">{{ row.stockname }}</div>-->
<!-- <div v-else>/</div>-->
@@ -677,11 +684,14 @@
<script>
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
-import { WareHouseSelect } from '@/api/materialManager'
-import { ProductInHouseOrderSearch, ProductInHouseWkshopOrder } from '@/api/produceManager'
-import { handleDatetime } from '@/utils/global'
-import { WorkShopSelect } from '@/api/deviceManager'
-import $ from 'jquery'
+import {
+ ProductInHouseOrderCodeSearch,
+ ProductInHouseOrderSearch, ProductInHouseOrderSeave,
+ ProductInHouseWkshopOrder
+} from '@/api/produceManager'
+import { handleDatetime, handleDatetime2 } from '@/utils/global'
+import { ErpUserSelect, ErpWarehouseSelect, ErpWkshopDepartmentSelect } from '@/api/basicInfo'
+import { getCookie } from '@/utils/auth'
export default {
name: 'Zzjg',
@@ -692,6 +702,8 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ hbillno: '', // 鍏ュ簱鍗曞彿
+ incbit: '', // 娴佹按鍙�
documentType: 'Y', // 鍗曟嵁绫诲瀷
wkshopcode: '', // 鐢熶骇杞﹂棿
@@ -703,7 +715,7 @@
orderdate: '', // 宸ュ崟鏃ユ湡
saleOrderCode: '', // 閿�鍞鍗�
- lm_date: '', // 鍗曟嵁鏃ユ湡
+ lm_date: new Date(), // 鍗曟嵁鏃ユ湡
stockcode: '' // 鍏ュ簱浠撳簱
},
@@ -723,20 +735,52 @@
tableDataSummary: [], // 姹囨�昏〃
- xxx: ''
+ isPermission: true, // 鏄惁鏈夋潈闄愬彲鎻愪氦
+
+ userArr: [] // ERP浜哄憳鏁扮粍
}
},
watch: {},
created() {
- this.getWareHouseSelect()
- this.getWorkShopSelect()
+ this.getErpUserSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
+
+ this.getWareHouseSelect()
+ this.getWorkShopSelect()
+
+ this.getProductInHouseOrderCodeSearch()
+
+ // this.getProductInHouseOrderSearch()
},
methods: {
+ async getProductInHouseOrderCodeSearch() {
+ const { data: res } = await ProductInHouseOrderCodeSearch({ rightcode: '2064' })
+ this.form.hbillno = res[0]
+ this.form.incbit = res[1]
+ },
+ async getErpUserSelect() {
+ const { data: res } = await ErpUserSelect()
+ this.userArr = res
+
+ if (!res.map(i => i.name).includes(getCookie('username'))) {
+ this.isPermission = false
+
+ await this.$alert('褰撳墠鐢ㄦ埛鍦‥RP绯荤粺涓笉瀛樺湪鎴栨湭鎺堟潈锛屾棤娉曞叆搴撴彁浜�', '鎻愮ず', {
+ confirmButtonText: '纭畾'
+ // callback: action => {
+ // this.$message({
+ // type: 'info',
+ // message: `action: ${action}`
+ // })
+ // }
+ })
+ }
+ },
+
// 鍗曟嵁绫诲瀷鏀瑰彉
documentTypeChange(val) {
this.form.erpordercode = ''
@@ -787,12 +831,12 @@
},
// 鑾峰彇浠撳簱鎺ュ彛
async getWareHouseSelect() {
- const { data: res } = await WareHouseSelect()
+ const { data: res } = await ErpWarehouseSelect()
this.stockcodeArr = res
},
// 鑾峰彇鎵�灞炶溅闂�
async getWorkShopSelect() {
- const { data: res } = await WorkShopSelect()
+ const { data: res } = await ErpWkshopDepartmentSelect()
this.WorkShopArr = res
},
@@ -807,6 +851,8 @@
this.form.orderdate = ''
this.tableDataDetail = []
+ this.tableDataSummary = []
+ this.multipleSelection = []
},
// 琛ㄦ牸鍗曞厓鏍煎弻鍑�
@@ -846,161 +892,198 @@
// 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 stockcodeArr = [...new Set(this.multipleSelection.map(i => i.stockcode))]// 鏁扮粍鍘婚噸
- const partcodeArr = data.map(i => i.partcode)
+ // const partcodeArr = [...new Set(this.multipleSelection.map(i => i.partcode))]// 鏁扮粍鍘婚噸
const newData = []
- if (val.label === '姹囨��') {
- data.forEach(i => {
- // if ()
+
+ const Array2D = []
+
+ stockcodeArr.forEach(i => {
+ Array2D.push(this.multipleSelection.filter(j => j.stockcode === i))
+ })
+
+ Array2D.forEach(k => {
+ const partcodeArr = [...new Set(k.map(j => j.partcode))]
+ partcodeArr.forEach(i => {
+ const t = k.find(j => j.partcode === i)
+ let sum = 0
+ const good_qty = k.filter(j => j.partcode === i).map(j => parseFloat(j.good_qty)).reduce((pre, curr) => {
+ sum = pre + curr
+ return sum
+ })
+ sum = 0
+ const inhouseqty = k.filter(j => j.partcode === i).map(j => parseFloat(j.inhouseqty)).reduce((pre, curr) => {
+ sum = pre + curr
+ return sum
+ })
+ sum = 0
+ const stinhouseqty = k.filter(j => j.partcode === i).map(j => parseFloat(j.stinhouseqty)).reduce((pre, curr) => {
+ sum = pre + curr
+ return sum
+ })
+ newData.push(
+ {
+ stockcode: t.stockcode,
+ partcode: t.partcode,
+ partname: t.partname,
+ partspec: t.partspec,
+ qty: t.qty,
+ good_qty,
+ inhouseqty,
+ stinhouseqty,
+ unitid: t.unitid,
+ unitname: t.unitname,
+ sourceVoucherDetailId: t.sbid,
+ saleOrderDetailId: t.saleOrderDetailId,
+ ManufactureOrderDetailId: t.sbid,
+ stck_id: this.stockcodeArr.find(i => i.code === t.stockcode).id,
+ SourceVoucherDetailIdByMergedFlow: t.sbid,
+ materiel_code: t.partcode,
+ warehouse: t.stockcode,
+ materiel_id: t.materiel_id
+ }
+ )
})
- }
+ })
+ // console.log(Array2D, 'Array2D')
+ // console.log(newData, 'newData')
+
+ // partcodeArr.forEach(i => {
+ // const t = this.multipleSelection.find(j => j.partcode === i)
+ // let sum = 0
+ // const good_qty = this.multipleSelection.filter(j => j.partcode === i).map(j => parseFloat(j.good_qty)).reduce((pre, curr) => {
+ // sum = pre + curr
+ // return sum
+ // })
+ // sum = 0
+ // const inhouseqty = this.multipleSelection.filter(j => j.partcode === i).map(j => parseFloat(j.inhouseqty)).reduce((pre, curr) => {
+ // sum = pre + curr
+ // return sum
+ // })
+ // sum = 0
+ // const stinhouseqty = this.multipleSelection.filter(j => j.partcode === i).map(j => parseFloat(j.stinhouseqty)).reduce((pre, curr) => {
+ // sum = pre + curr
+ // return sum
+ // })
+ // newData.push(
+ // {
+ // partcode: i,
+ // partname: t.partname,
+ // partspec: t.partspec,
+ // qty: t.qty,
+ // good_qty,
+ // inhouseqty,
+ // stinhouseqty
+ // }
+ // )
+ // })
+ this.tableDataSummary = newData.flat()
},
- // 鎻愪氦
+ // 鍏ュ簱鎻愪氦
submit() {
+ this.tabClick()
+ this.$confirm('鏄惁纭鎻愪氦?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ if (this.multipleSelection.length === 0) {
+ return this.$message.error('鏈�夋嫨浜у搧锛�')
+ }
+ if (this.multipleSelection.find(i => !i.stockcode)) {
+ return this.$message.error('鏄庣粏閲岄潰鏈変骇鍝佹湭濉啓浠撳簱锛�')
+ }
+ this.multipleSelection.forEach(i => {
+ i.stockname = this.stockcodeArr.find(j => j.code === i.stockcode).name
+ i.id = this.stockcodeArr.find(j => j.code === i.stockcode).id
+ })
+
+ const head = {
+ rightcode: '2064',
+ hbillno: this.form.hbillno,
+ incbit: this.form.incbit,
+ wkshpcode: this.form.wkshopcode,
+ sourceVoucherId: this.form.documentType === 'Y' ? this.tableDataDetail[0].mpoid : '',
+ sourceVoucherCode: this.form.documentType === 'Y' ? this.tableDataDetail[0].m_po : this.tableDataDetail[0].wo_code,
+ saleOrderId: this.tableDataDetail[0].saleOrderid,
+ saleOrderCode: this.tableDataDetail[0].saleOrderCode,
+ rdDirectionFlag: 1,
+ makerid: this.userArr.find(i => i.name === getCookie('username')).id,
+ maker: getCookie('username'),
+ accountingyear: new Date().getFullYear(),
+ VoucherYear: new Date().getFullYear(),
+ VoucherPeriod: new Date().getMonth() + 1,
+ ManufactureOrderCode: this.form.documentType === 'Y' ? this.tableDataDetail[0].m_po : this.tableDataDetail[0].wo_code,
+ idbusitype: '03',
+ iddepartment: this.WorkShopArr.find(i => i.code === this.form.wkshopcode).id,
+ idrdstyle: 21,
+ idwarehouse: '',
+ voucherState: 181,
+ idvouchertype: 15,
+ voucherdate: handleDatetime(new Date().getTime()),
+ madedate: handleDatetime(new Date().getTime()),
+ createdtime: handleDatetime2(new Date().getTime()),
+ DataSource: '56133',
+ idsourcevouchertype: 69
+ }
+
+ const subsum = []
+ this.tableDataSummary.forEach((i, index) => {
+ subsum.push({
+ code: index.toString().padStart(4, '0'),
+ rownumber: index + 1,
+ arrivalQuantity: i.qty,
+ quantity: i.stinhouseqty,
+ compositionQuantity: i.stinhouseqty + i.unitname,
+ baseQuantity: i.stinhouseqty,
+ sourceVoucherId: this.form.documentType === 'Y' ? this.tableDataDetail[0].mpoid : '',
+ sourceVoucherCode: this.form.documentType === 'Y' ? this.tableDataDetail[0].m_po : this.tableDataDetail[0].wo_code,
+ sourceVoucherDetailId: i.sourceVoucherDetailId,
+ idsourcevouchertype: 69,
+ saleOrderId: this.tableDataDetail[0].saleOrderid,
+ saleOrderCode: this.tableDataDetail[0].saleOrderCode,
+ saleOrderDetailId: i.saleOrderDetailId,
+ ManufactureOrderId: this.form.documentType === 'Y' ? this.tableDataDetail[0].mpoid : '',
+ ManufactureOrderCode: this.form.documentType === 'Y' ? this.tableDataDetail[0].m_po : this.tableDataDetail[0].wo_code,
+ ManufactureOrderDetailId: i.ManufactureOrderDetailId,
+ idbusiTypeByMergedFlow: 3,
+ idinventory: i.materiel_id,
+ idbaseunit: i.unitid,
+ idunit: i.unitid,
+ idwarehouse: i.stck_id,
+ SourceVoucherIdByMergedFlow: this.tableDataDetail[0].mpoid,
+ SourceVoucherCodeByMergedFlow: this.tableDataDetail[0].m_po,
+ SourceVoucherDetailIdByMergedFlow: i.SourceVoucherDetailIdByMergedFlow,
+ idsourceVoucherTypeByMergedFlow: 69,
+ createdtime: handleDatetime2(new Date().getTime()),
+ DataSource: '56133',
+ materiel_code: i.materiel_code,
+ warehouse: i.warehouse
+ })
+ })
+
+ const data = {
+ head, sub: this.multipleSelection, subsum
+ }
+
+ ProductInHouseOrderSeave(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍏ュ簱鎻愪氦鎴愬姛锛�')
+ this.getProductInHouseOrderCodeSearch()
+ this.wkshopcodeChange(this.form.wkshopcode)
+ this.tableDataDetail = []
+ this.tableDataSummary = []
+ this.multipleSelection = []
+ }
+ })
+ })
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
--
Gitblit v1.9.3