From c3eb6c900630ba847c5bd55ff0b8657b8d1ed1ea Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 24 五月 2023 17:24:01 +0800
Subject: [PATCH] 1.新增补打生产条码功能（还没全实现）2.生产开报工页面末道工序打印入库条码
---
src/views/produceManager/produceStartOrder.vue | 86 +++++++++++++++++++++++-----
src/api/systemSettings.js | 9 +++
src/views/qualityManager/processCheck.vue | 5 +
src/api/produceManager.js | 8 ++
src/views/produceManager/workOrder.vue | 45 ++++++++++++---
5 files changed, 127 insertions(+), 26 deletions(-)
diff --git a/src/api/produceManager.js b/src/api/produceManager.js
index 894710b..99d8ad9 100644
--- a/src/api/produceManager.js
+++ b/src/api/produceManager.js
@@ -409,3 +409,11 @@
method: 'post'
})
}
+// 琛ユ墦鐢熶骇鍏ュ簱鏉＄爜
+export function ProductInHouseLabCode(data) {
+ return request({
+ url: 'ProductionManagement/ProductInHouseLabCode',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/api/systemSettings.js b/src/api/systemSettings.js
index dc37f10..fa7f4ad 100644
--- a/src/api/systemSettings.js
+++ b/src/api/systemSettings.js
@@ -52,3 +52,12 @@
params: data
})
}
+
+// 鐢熸垚绯荤粺鏉＄爜(鑷畾涔�)
+export function LabelBarCode(data) {
+ return request({
+ url: 'SystemSetting/LabelBarCode',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index 00e9c72..deb0418 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -1051,8 +1051,8 @@
<div
style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
>
- <div style="width:60px;margin-left: 5px;">涓嬮亾宸ュ簭:</div>
- <div>{{ qrForm.nextstepname }}</div>
+ <div style="width:60px;margin-left: 5px;">{{ qrForm.nextstepname?'涓嬮亾宸ュ簭':'浜у搧瑙勬牸' }}:</div>
+ <div>{{ qrForm.nextstepname?qrForm.nextstepname:qrForm.partspec?qrForm.partspec:'/' }}</div>
</div>
<div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;text-align: left">
<div style="width: 60px;margin-left: 5px;">澶勭悊鏃堕棿:</div>
@@ -1270,6 +1270,7 @@
import { handleDatetime2 } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { LabelBarCode } from '@/api/systemSettings'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -1307,8 +1308,8 @@
WXradioSelected: '', // 宸ュ簭閫変腑
form: {
orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'wo_code', // 鎺掑簭瀛楁
- order: 'asc', // 鎺掑簭瀛楁
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
@@ -1316,8 +1317,8 @@
tableData: [],
WXform: { // 澶栧崗琛ㄥ崟
orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'wo_code', // 鎺掑簭瀛楁z
- order: 'asc', // 鎺掑簭瀛楁
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
@@ -1340,6 +1341,7 @@
stepcode: '', // 宸ュ簭缂栫爜
stepname: '', // 褰撳墠宸ュ簭鍚�
nextstepname: '', // 涓嬩竴閬撳伐搴忓悕
+ nextstepcode: '', // 涓嬩竴閬撳伐搴忕紪鐮�
stepdesc: '', // 宸ュ簭鎻忚堪
planqty: '', // 浠诲姟鏁伴噺
reportqty: '', // 宸叉姤鏁伴噺
@@ -1368,7 +1370,9 @@
reckway: 'group', // 璁′欢鏂瑰紡
operation: getCookie('navTabId'), // 鎶ュ伐浜猴紙鏀舵枡浜猴級
- remarks: ''// 澶囨敞
+ remarks: '', // 澶囨敞
+
+ inbarcode: ''// 鏈亾宸ュ簭鏃� 鎵撳嵃鐨勫叆搴撶爜
},
ZZuserArr: [], // 鑷埗鐢ㄦ埛鎵�鏈�
@@ -1445,14 +1449,15 @@
wo_code: '',
partcode: '',
partname: '',
+ partspec: '',
nextstepname: '',
operator: '', // 鎿嶄綔浜�
operatorTime: ''// 鎿嶄綔鏃堕棿
},
badForm: {
orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜
- prop: 'wo_code',
- order: 'asc',
+ prop: 'lm_date',
+ order: 'desc',
page: 1,
rows: 20
},
@@ -1812,7 +1817,7 @@
this.dialogForm.startqty = obj.noreportqty
this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
+ this.dialogForm.nextstepcode = obj.nextstepcode
this.dialogForm.startqtySum = obj.noreportqty
@@ -1875,7 +1880,7 @@
this.dialogForm.stepcode = obj.stepcode
this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
+ this.dialogForm.nextstepcode = obj.nextstepcode
this.dialogForm.noputqty = obj.noputqty
this.dialogForm.stepseq = obj.seq
@@ -2104,6 +2109,8 @@
this.dialogForm.nextstepcode = '' // 涓嬮亾宸ュ簭缂栫爜
+ // this.dialogForm.inbarcode = '' // 鍏ュ簱鐮�
+
this.dialogForm.reckway = 'group'
this.dialogForm.remarks = '' // 澶囨敞
@@ -2119,7 +2126,7 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
+ this.$refs.dialogForm.validate(async valid => {
if (valid) {
if (this.dialogTitle === '澶栧崗鍙戞枡') {
if (parseFloat(this.dialogForm.fqty) > parseFloat(this.dialogForm.noreportqty)) {
@@ -2159,6 +2166,21 @@
}
}
+ this.dialogForm.inbarcode = ''
+ // 褰撲负鏈亾鐨勬椂鍊�
+ if (this.dialogForm.nextstepcode === '') {
+ const D = {
+ rightcode: '2064',
+ partcode: this.dialogForm.partcode,
+ qty: this.dialogForm.sqty,
+ onelabqty: this.dialogForm.sqty
+ }
+ const r = await LabelBarCode(D)
+ this.dialogForm.inbarcode = r.data[0].labcode
+
+ this.qrForm.partspec = this.dialogForm.partspec
+ }
+
const data = {
mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
@@ -2169,6 +2191,7 @@
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
sqty: this.dialogForm.sqty, // 鏀舵枡鏁伴噺
remarks: this.dialogForm.remarks, // 澶囨敞
+ inbarcode: this.dialogForm.inbarcode, // 鐢熶骇鍏ュ簱鏉＄爜
ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
@@ -2245,7 +2268,23 @@
// console.log(this.userTableData, 1)
// const reportuser = this.userTableData.map(item => item.usercode).join(';')// 涓昏鏀圭殑鏄繖閲岀殑鏍煎紡
- console.log(this.dialogForm.operation, 'dialogForm.operation')
+ // console.log(this.dialogForm.operation, 'dialogForm.operation')
+
+ this.dialogForm.inbarcode = ''
+ // 褰撲负鏈亾鐨勬椂鍊�
+ if (this.dialogForm.nextstepcode === '') {
+ const D = {
+ rightcode: '2064',
+ partcode: this.dialogForm.partcode,
+ qty: this.dialogForm.startqty,
+ onelabqty: this.dialogForm.startqty
+ }
+ const r = await LabelBarCode(D)
+ this.dialogForm.inbarcode = r.data[0].labcode
+
+ this.qrForm.partspec = this.dialogForm.partspec
+ }
+
const data = {
mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
@@ -2265,6 +2304,9 @@
reportqty: this.dialogForm.startqty, // 鎶ュ伐鏁伴噺
remarks: this.dialogForm.remarks, // 澶囨敞
reckway: this.dialogForm.reckway, // 璁′欢鏂瑰紡
+
+ inbarcode: this.dialogForm.inbarcode, // 鐢熶骇鍏ュ簱鏉＄爜
+
ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
@@ -2272,11 +2314,13 @@
// console.log(JSON.stringify(data), 'data')
console.log(data, 'data')
this.$store.state.app.buttonIsDisabled = true
+
SavaMesOrderStepReport(data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
this.$message.success('鎶ュ伐鎴愬姛锛�')
- // if (this.dialogForm.nextstepcode === '') {
+ // this.dialogForm.nextstepcode==='' //褰撲负绌虹殑鏃跺�� 浠ｈ〃鏄湯閬撳伐搴�
+ // if (this.dialogForm.nextstepcode !== '') {
this.ZZprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
this.dialogVisible2 = true
// }
@@ -2304,7 +2348,12 @@
})
},
ZZprint2(username) {
- this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
+ if (this.dialogForm.nextstepcode !== '') {
+ this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
+ } else {
+ this.qrForm.qrvalue = this.dialogForm.inbarcode
+ }
+
this.qrForm.startqty = this.dialogForm.startqty
this.qrForm.wo_code = this.dialogForm.wo_code
this.qrForm.partcode = this.dialogForm.partcode
@@ -2317,7 +2366,11 @@
})
},
WXprint2(username) {
- this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
+ if (this.dialogForm.nextstepcode !== '') {
+ this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
+ } else {
+ this.qrForm.qrvalue = this.dialogForm.inbarcode
+ }
this.qrForm.startqty = this.dialogForm.sqty
this.qrForm.wo_code = this.dialogForm.wo_code
this.qrForm.partcode = this.dialogForm.partcode
@@ -2335,6 +2388,7 @@
this.qrForm.wo_code = ''
this.qrForm.partcode = ''
this.qrForm.partname = ''
+ this.qrForm.partspec = ''
this.qrForm.nextstepname = ''
this.qrForm.operator = ''
this.qrForm.operatorTime = ''
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index c413e4e..051fe3c 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -445,10 +445,20 @@
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">
<i
+ v-if="tableDataDetail.length!==row.seq"
class="el-icon-printer"
:style="{color:$store.state.settings.theme}"
style="cursor: pointer;margin-right: 15px"
@click="supplementSmallClick(row)"
+ />
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="琛ユ墦鐢熶骇鍏ュ簱鏉＄爜" placement="top">
+ <i
+ v-if="tableDataDetail.length===row.seq"
+ class=" el-icon-camera"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-right: 15px"
+ @click="getProductInHouseLabCode(row.wo_code)"
/>
</el-tooltip>
</div>
@@ -750,7 +760,7 @@
<!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
<el-button
- v-if="!submitBottonIsDisabled"
+ v-if="!submitButtonIsDisabled"
v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
@@ -759,7 +769,7 @@
>纭� 瀹�</el-button>
<el-button
- v-if="submitBottonIsDisabled"
+ v-if="submitButtonIsDisabled"
v-waves
type="primary"
disabled
@@ -1389,7 +1399,7 @@
</div>
<!-- 瑕佹墦鍗扮殑鍖哄煙 -->
<!-- <div id="printMe2" :style="{paddingLeft:'10px',paddingTop: '5px'}">-->
- <div id="printMe2" :style="printMe2StylePadding(printSize)">
+ <div v-if="!isLastPrint" id="printMe2" :style="printMe2StylePadding(printSize)">
<div
v-if="printSize===0"
style="display: flex;width: 280px;height: 160px;border: 1px solid #000;text-align: center;font-size: 10px;"
@@ -1635,6 +1645,11 @@
</div>
</div>
+
+ <div v-if="isLastPrint">
+ 123
+ </div>
+
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -1773,7 +1788,7 @@
ClosedMesOrder,
DeleteMesOrder, MesBadOrderSearch, JobCreationSonAddVison,
MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SelectRouteOrWkshop,
- SelectRouteStep, AddMesOrderCodeSearch
+ SelectRouteStep, AddMesOrderCodeSearch, ProductInHouseLabCode
} from '@/api/produceManager'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/makeModel'
import { handleDatetime, handleDatetime2, validateCode } from '@/utils/global'
@@ -2020,7 +2035,9 @@
return time.getTime() < Date.now() - 8.64e7
}
},
- submitBottonIsDisabled: false
+ submitButtonIsDisabled: false,
+
+ isLastPrint: false// 鏄惁鏄湯閬撴墦鍗�
}
},
created() {
@@ -2158,7 +2175,7 @@
this.dialogForm.wkshopcode = ''
- this.submitBottonIsDisabled = false
+ this.submitButtonIsDisabled = false
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange(val) {
@@ -2171,7 +2188,7 @@
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
- this.submitBottonIsDisabled = false
+ this.submitButtonIsDisabled = false
},
// 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
wkshopcodeChange(val) {
@@ -2184,7 +2201,7 @@
// console.log(res, 1)
}).catch(err => {
// console.log(err, 2)
- this.submitBottonIsDisabled = true
+ this.submitButtonIsDisabled = true
})
},
@@ -2349,7 +2366,7 @@
this.bomIdArr = []
this.$refs.dialogForm.clearValidate()
- this.submitBottonIsDisabled = false
+ this.submitButtonIsDisabled = false
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -2596,6 +2613,15 @@
this.dialogVisible2 = true
console.log(this.qrForm, 1111)
},
+ // 琛ユ墦鐢熶骇鍏ュ簱鏉＄爜
+ async getProductInHouseLabCode(ordercode) {
+ const res = await ProductInHouseLabCode({ ordercode })
+ console.log(res)
+ this.isLastPrint = true
+ // 鍋氫竴浜涙墦鍗板閫夌殑鎿嶄綔
+
+ this.dialogVisible2 = true
+ },
dialogVisible2Close() {
this.qrForm.qrvalue = ''
this.qrForm.startqty = ''
@@ -2606,6 +2632,7 @@
this.qrForm.operator = ''
this.qrForm.operatorTime = ''
// this.$refs.qrCodeDiv2 = ''
+ this.isLastPrint = false
},
// 鐢熸垚浜岀淮鐮� 宸ュ簭鏍囩浜岀淮鐮�
bindQRCode2(text) {
diff --git a/src/views/qualityManager/processCheck.vue b/src/views/qualityManager/processCheck.vue
index a6687b4..85f5b7a 100644
--- a/src/views/qualityManager/processCheck.vue
+++ b/src/views/qualityManager/processCheck.vue
@@ -362,7 +362,10 @@
this.form.checkstandcode = res.chekstand[0].checkstandcode
this.form.checkstandname = res.chekstand[0].checkstandname
this.form.sampmethod = res.chekstand[0].sampmethod
- this.form.sampscare = res.chekstand[0].sampscare // 涓嬪崍鍐欒繖閲� *姣斾緥
+
+ this.form.sampscare = res.chekstand[0].sampmethod === 'FIXED' ? res.data.chekstand[0].sampscare
+ : res.data.labcont[0].good_qty * res.data.chekstand[0].sampscare / 100
+ this.form.sampscare = this.form.sampscare <= this.form.good_qty ? this.form.sampscare : this.form.good_qty
await this.getMesOrderStepCheckItemList()
},
--
Gitblit v1.9.3