From 2a12da2908a1be0d5174ab9a5217a426736f60fe Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 11 十二月 2025 13:56:06 +0800
Subject: [PATCH] 1.生产工单新增修改时销售订单号
---
src/views/produce/productWarehouse.vue | 29 +++++++++++++++++++----------
src/views/workOrder/workOrderList.vue | 26 +++++++++++++++++++++++---
2 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/src/views/produce/productWarehouse.vue b/src/views/produce/productWarehouse.vue
index 0f12a78..b365178 100644
--- a/src/views/produce/productWarehouse.vue
+++ b/src/views/produce/productWarehouse.vue
@@ -783,9 +783,11 @@
})
const D1 = {
'dto': {
- 'IsModifiedCode': true,
+ // 'IsModifiedCode': true,
+ 'IsModifiedCode': false,
'ExternalCode': this.form.hbillno,
- 'Code': this.form.hbillno,
+ // 'Code': this.form.hbillno,
+ 'Code': '',
'VoucherType': {
'Code': 'ST1002'
},
@@ -837,7 +839,8 @@
'Code': this.form.stockcode// 浠撳簱缂栫爜
},
'Code': this.form.hbillno, // 鍗曟嵁缂栫爜
- 'IsModifiedCode': true,
+ // 'IsModifiedCode': true,
+ 'IsModifiedCode': false,
'BusiType': {
'Code': '03'// 涓氬姟绫诲瀷缂栫爜
},
@@ -869,17 +872,24 @@
'Content-Type': 'application/json'
}
}
- )
+ ).catch(e => {
+ // this.$message.error(JSON.stringify(e.response.data.message))
+ this.$message.error(e.response.data.message)
+ })
}
- // console.log(res)
- // console.log(res.data.code)
+ console.log(res)
+ console.log(res.data.code)
+ console.log('``````````')
+ console.log(res.data.data.Code)
// || res.data === null
+
if (res.data.code === 0) {
const TableDetailData = []
this.multipleSelection.forEach((i, index) => {
TableDetailData.push({
'hbillno': this.form.hbillno, // 鍏ュ簱鍗曞彿
+ 'InOrdercode': res.data.data.Code,
'wocode': i.wo_code, // 宸ュ崟鍙�
'rownumber': (index + 1).toString(), // 琛屽彿
'sourceVoucherId': i.mpoid ? i.mpoid.toString() : '', // 鏉ユ簮鍗曟嵁id
@@ -909,6 +919,7 @@
[
{
'hbillno': this.form.hbillno, // 鍏ュ簱鍗曞彿
+ 'InOrdercode': res.data.data.Code,
'madedate': handleDatetime(this.form.hbdate) + ' 00:00:00', // 鍒跺崟鏃ユ湡锛堝勾鏈堟棩 00:00:00锛�
'hbdate': this.multipleSelection[this.multipleSelection.length - 1].voucherdate,
@@ -937,9 +948,9 @@
// console.log(JSON.stringify(data))
// this.$store.state.app.buttonIsDisabled = true
- const res = await InHouseOrderSpSeave(data)
+ const res2 = await InHouseOrderSpSeave(data)
this.$store.state.app.buttonIsDisabled = false
- if (res.code === '200') {
+ if (res2.code === '200') {
this.$message.success('鍏ュ簱鎴愬姛锛�')
this.multipleSelection = []
// this.form.deptno = ''
@@ -949,8 +960,6 @@
await this.getProductInHouseOrderCodeSearch()
}
} else {
- // console.log(res.data)
-
this.$store.state.app.buttonIsDisabled = false
this.$message.error(res.data.message)
}
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index b6b8126..faf51a1 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -856,7 +856,13 @@
/>
</el-select>
</el-form-item>
-
+ <el-form-item label="閿�鍞鍗�" prop="">
+ <el-input
+ v-model="dialogForm.saleordercode"
+ style="width: 200px"
+ :disabled="!(dialogForm.mesorderstus==='NEW'&&dialogForm.data_sources==='MES')"
+ />
+ </el-form-item>
<el-form-item label="棰勮浜や粯鏃ユ湡" prop="deliverydate">
<el-date-picker
v-model="dialogForm.deliverydate"
@@ -2572,7 +2578,13 @@
/>
</el-select>
</el-form-item>
-
+ <el-form-item label="閿�鍞鍗�" prop="">
+ <el-input
+ v-model="i.saleordercode"
+ style="width: 200px"
+ :disabled="!(i.mesorderstus==='NEW'&&i.data_sources==='MES')"
+ />
+ </el-form-item>
<el-form-item label="棰勮浜や粯鏃ユ湡" prop="deliverydate">
<el-date-picker
v-model="i.deliverydate"
@@ -2808,6 +2820,8 @@
ordertype: 'PO', // 宸ュ崟绫诲瀷
sourceorderid: '', // 婧愬崟id
sourceorder: '', // 婧愬崟鍗曞彿
+
+ saleordercode: '', // 閿�鍞鍗曞彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -3160,6 +3174,7 @@
ordertype: i.wotype, // 宸ュ崟绫诲瀷
sourceorderid: i.sourceid, // 婧愬崟id
sourceorder: i.m_po, // 婧愬崟鍗曞彿
+ saleordercode: i.saleOrderCode,
partcode: i.partcode, // 浜у搧缂栫爜
partname: i.partname, // 浜у搧鍚嶇О
partspec: i.partspec, // 浜у搧瑙勬牸
@@ -3274,6 +3289,7 @@
sourceid: i.sourceorderid, // 婧愬崟id
sourcewo: i.sourceorder, // 婧愬崟鍗曞彿
partcode: i.partcode, // 浜у搧缂栧彿
+ saleordercode: i.saleordercode, // 閿�鍞崟鍙�
wkshopcode: i.wkshopcode,
woqty: i.mesqty, // 宸ュ崟鏁伴噺
deliverydate: i.deliverydate, // 浜や粯鏃堕棿
@@ -3625,6 +3641,8 @@
this.form.ordertype = ''
// this.form.createdate = ''
+ this.form.saleordercode = ''
+
this.form.timeValue = []
this.cycleTime = null
this.$refs.DateTypeRef.clearValue()
@@ -3738,6 +3756,7 @@
this.dialogForm.ordertype = row.wotype
this.dialogForm.sourceorderid = row.sourceid
this.dialogForm.sourceorder = row.m_po
+ this.dialogForm.saleordercode = row.saleOrderCode
this.dialogForm.partcode = row.partcode
this.dialogForm.partname = row.partname
this.dialogForm.partspec = row.partspec
@@ -3952,7 +3971,7 @@
ordertype: 'PO', // 宸ュ崟绫诲瀷
sourceorderid: '', // 婧愬崟id
sourceorder: '', // 婧愬崟鍗曞彿
-
+ saleordercode: '', // 閿�鍞鍗曞彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
@@ -4031,6 +4050,7 @@
wotype: this.dialogForm.ordertype, // 宸ュ崟绫诲瀷
sourceid: this.dialogForm.sourceorderid, // 婧愬崟id
sourcewo: this.dialogForm.sourceorder, // 婧愬崟鍗曞彿
+ saleordercode: this.dialogForm.saleordercode, // 閿�鍞鍗曞彿
partcode: this.dialogForm.partcode, // 浜у搧缂栧彿
wkshopcode: this.dialogForm.wkshopcode,
woqty: this.dialogForm.mesqty, // 宸ュ崟鏁伴噺
--
Gitblit v1.9.3