MeiRuiAn/HuaiAn.git

dengjunjie

2025-01-03 2f5159e93f42609d22d0c565ad730560ee5ee21f

更新PDA

已修改3个文件

	代码管理/淮安PDA/common/config.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/淮安PDA/pages/stash/boxing.vue	59 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/淮安PDA/pages/stash/raworderboxing.vue	39 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ´úÂë¹ÜÀí/»´°²PDA/common/config.js

@@ -1,8 +1,8 @@
let config = {
    baseUrl: 'http://10.30.4.92:9293',
    baseUrl: 'http://10.30.4.92:9283',
    urls: [
        'http://10.30.4.92:9293',
        'http://10.30.4.92:9293'
        'http://10.30.4.92:9283',
        'http://10.30.4.92:9283'
    ]
}
export {

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/boxing.vue

@@ -14,8 +14,9 @@
                            <uni-easyinput type="text" placeholder="è¯·æ«æåç®±æ ç¾" ref='midInput' :focus="focus"
                                v-model="materSn" @input="snInput" />
                        </uni-forms-item>
                        <uni-forms-item label="åå§å¯¿å½:" v-if="Test">
                            <uni-easyinput type="text" placeholder="è¯·è¾å¥åå§å¯¿å½" ref='midInput' v-model="Initiallife" />
                        <uni-forms-item :label="Testlabel" v-if="Test">
                            <uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
                                v-model="Initiallife" />
                        </uni-forms-item>
                        <!-- <uni-forms-item>
                            <checkbox checked="check">æ¯å¦æ»¡ç</checkbox>
@@ -166,6 +167,7 @@
                materSn: "",
                Initiallife: 1000,
                sns: [],
                sn: "",
                addressFocus: false,
                inboundBarcode: "",
                address: "",
@@ -176,6 +178,8 @@
                matTotals: [],
                warehouseId: "",
                Test: false,
                Testlabel: "",
                Testplaceholder: "",
                Testcheck: false,
            }
        },
@@ -185,7 +189,16 @@
            this.addressFocus = false;
            this.orderNo = res.orderNo;
            this.warehouseId = res.warehouseId;
            this.Test = this.warehouseId == 6; //æµè¯æ¶ä»åºåºID
            if (this.warehouseId == 6) { //æµè¯æ¶ä»åºåºID
                this.Test = true;
                this.Testlabel = "åå§å¯¿å½:";
                this.Testplaceholder = "è¯·è¾å¥åå§å¯¿å½";
            } else if (this.warehouseId == 2) { //æ²¹å¢¨ä»åºåºID
                this.Test = true;
                this.Testlabel = "æ°é:";
                this.Testplaceholder = "è¯·è¾å¥æ°é";
                this.Initiallife = 16;
            }
            this.label = "åæ®ç¼å·ï¼" + this.orderNo;
            this.getData();
        },
@@ -335,6 +348,11 @@
            },
            snInput() {
                this.$nextTick(() => {
                    if (this.warehouseId == 6) {
                        if (this.sns.length > 0) {
                            this.sns = [];
                        }
                    }
                    if (this.materSn != "") {
                        this.focus = false;
                        var matSn = this.materSn;
@@ -344,37 +362,31 @@
                        this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
                            this.Testcheck = false;
                            if (res.status) {
                                // debugger
                                // this.matTotal.push({
                                //     matCode: res.data.materielCode,
                                //     matQuantity: parseInt(res.data.quantity)
                                // });
                                this.sns.push(res.data.serialNumber);

                                // this.matInfos.splice(0, this.matInfos.length);
                                if (this.warehouseId == 6) {
                                    if (this.matInfos.length > 0) {
                                        this.matInfos = [];
                                    }
                                }
                                this.matInfos.push(res.data);
                                if (res.message) {
                                    this.$refs.uToast.show({
                                        title: res.message,
                                        type: "error"
                                    })
                                    // setTimeout(this.updateFocus,200);
                                    setTimeout(() => {
                                        this.voiceSpeech('../../static/fail.mp3');
                                    }, 100);
                                    return;
                                }
                                // setTimeout(this.updateFocus,200);
                                setTimeout(() => {
                                    this.voiceSpeech('../../static/success.mp3');
                                }, 100);
                            } else {
                                // this.innerCode = "";
                                this.$refs.uToast.show({
                                    title: res.message,
                                    type: "error"
                                })
                                // setTimeout(this.updateFocus,200);
                                setTimeout(() => {
                                    this.voiceSpeech('../../static/fail.mp3');
                                }, 100);
@@ -456,15 +468,30 @@
                if (this.Test) {
                    if (!this.Testcheck) {
                        this.Testcheck = true;
                        if (this.warehouseId == 2) {
                            this.$refs.uToast.show({
                                title: "è¯·ç¡®è®¤æ°é",
                                type: 'error'
                            })
                        } else if (this.warehouseId == 6) {
                        this.$refs.uToast.show({
                            title: "è¯·ç¡®è®¤åå§å¯¿å½",
                            type: 'error'
                        })
                        }
                        return;
                    }
                }

                let url = 'palletCode=' + this.barcode + '&initiallife=' + this.Initiallife + '&warehouseId=' + this.warehouseId;
                if (this.warehouseId == 2) { //æ²¹å¢¨ä»åºåºID
                    this.sn = this.sns[0];
                    debugger
                    for (var i = 0; i < this.Initiallife - 1; i++) {
                        this.sns.push(this.sn);
                    }
                }
                debugger
                let url = 'palletCode=' + this.barcode + '&initiallife=' + this.Initiallife + '&warehouseId=' + this
                    .warehouseId;
                
                this.$u.post('/api/InboundOrder/ManualMaterielGroup?' + url, this.sns).then(res => {
                    this.Testcheck = false;

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/raworderboxing.vue

@@ -16,9 +16,12 @@
                            <uni-easyinput type="text" placeholder="è¯·æ«æåç®±æ ç¾" ref='midInput' :focus="focus"
                                v-model="materSn" @input="snInput" />
                        </uni-forms-item>
                        <uni-forms-item label="åå§å¯¿å½:" v-if="Test">
                            <uni-easyinput type="text" placeholder="è¯·è¾å¥åå§å¯¿å½" ref='midInput' v-model="Initiallife" />
						
                        <uni-forms-item :label="Testlabel" v-if="Test">
                            <uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
                                v-model="Initiallife" />
                        </uni-forms-item>
						
                        <!-- <uni-forms-item>
                            <checkbox checked="check">æ¯å¦æ»¡ç</checkbox>
                        </uni-forms-item> -->
@@ -178,6 +181,8 @@
                matTotals: [],
                warehouseId: "",
                Test: false,
                Testlabel: "",
                Testplaceholder: "",
                Testcheck: false,
            }
        },
@@ -187,7 +192,16 @@
            this.addressFocus = false;
            this.orderNo = res.orderNo;
            this.warehouseId = res.warehouseId;
            this.Test = this.warehouseId == 6; //æµè¯æ¶ä»åºåºID
            if (this.warehouseId == 6) { //æµè¯æ¶ä»åºåºID
                this.Test = true;
                this.Testlabel = "åå§å¯¿å½:";
                this.Testplaceholder = "è¯·è¾å¥åå§å¯¿å½";
            } else if (this.warehouseId == 2) { //æ²¹å¢¨ä»åºåºID
                this.Test = true;
                this.Testlabel = "æ°é:";
                this.Testplaceholder = "è¯·è¾å¥æ°é";
                this.Initiallife = 16;
            }
            this.label = "åæ®ç¼å·ï¼" + this.orderNo;
            this.getData();
        },
@@ -486,27 +500,8 @@
                })
            },
            deleteList(res) {
                // var sn = '';
				
                    this.matInfos.splice(res, 1);
                        this.sns.splice(res, 1);
                // this.matInfos.map((item, index) => {
                //     if (item.sn == res) {
                //         this.matInfos.splice(index, 1);
                //         sn = item.sn;
                //         var tmp = this.matTotal.find(x => x.matCode == item.matCode);
                //         if (tmp) {
                //             tmp.matQuantity -= parseInt(item.quantity);
                //         } else {

                //         }
                //     }
                // })
                // this.sns.map((item, index) => {
                //     if (item == res) {
                //         this.sns.splice(index, 1);
                //     }
                // })
            },
            submit() {
                if (this.barcode == "") {

			@@ -1,8 +1,8 @@
			let config = {
			baseUrl: 'http://10.30.4.92:9293',
			baseUrl: 'http://10.30.4.92:9283',
			urls: [
			'http://10.30.4.92:9293',
			'http://10.30.4.92:9293'
			'http://10.30.4.92:9283',
			'http://10.30.4.92:9283'
			]
			}
			export {

			@@ -14,8 +14,9 @@
			<uni-easyinput type="text" placeholder="è¯·æ«æåç®±æ ç¾" ref='midInput' :focus="focus"
			v-model="materSn" @input="snInput" />
			</uni-forms-item>
			<uni-forms-item label="åå§å¯¿å½:" v-if="Test">
			<uni-easyinput type="text" placeholder="è¯·è¾å¥åå§å¯¿å½" ref='midInput' v-model="Initiallife" />
			<uni-forms-item :label="Testlabel" v-if="Test">
			<uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
			v-model="Initiallife" />
			</uni-forms-item>
			<!-- <uni-forms-item>
			<checkbox checked="check">æ¯å¦æ»¡ç</checkbox>
			@@ -166,6 +167,7 @@
			materSn: "",
			Initiallife: 1000,
			sns: [],
			sn: "",
			addressFocus: false,
			inboundBarcode: "",
			address: "",
			@@ -176,6 +178,8 @@
			matTotals: [],
			warehouseId: "",
			Test: false,
			Testlabel: "",
			Testplaceholder: "",
			Testcheck: false,
			}
			},
			@@ -185,7 +189,16 @@
			this.addressFocus = false;
			this.orderNo = res.orderNo;
			this.warehouseId = res.warehouseId;
			this.Test = this.warehouseId == 6; //æµè¯æ¶ä»åºåºID
			if (this.warehouseId == 6) { //æµè¯æ¶ä»åºåºID
			this.Test = true;
			this.Testlabel = "åå§å¯¿å½:";
			this.Testplaceholder = "è¯·è¾å¥åå§å¯¿å½";
			} else if (this.warehouseId == 2) { //æ²¹å¢¨ä»åºåºID
			this.Test = true;
			this.Testlabel = "æ°é:";
			this.Testplaceholder = "è¯·è¾å¥æ°é";
			this.Initiallife = 16;
			}
			this.label = "åæ®ç¼å·ï¼" + this.orderNo;
			this.getData();
			},
			@@ -335,6 +348,11 @@
			},
			snInput() {
			this.$nextTick(() => {
			if (this.warehouseId == 6) {
			if (this.sns.length > 0) {
			this.sns = [];
			}
			}
			if (this.materSn != "") {
			this.focus = false;
			var matSn = this.materSn;
			@@ -344,37 +362,31 @@
			this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
			this.Testcheck = false;
			if (res.status) {
			// debugger
			// this.matTotal.push({
			// matCode: res.data.materielCode,
			// matQuantity: parseInt(res.data.quantity)
			// });
			this.sns.push(res.data.serialNumber);

			// this.matInfos.splice(0, this.matInfos.length);
			if (this.warehouseId == 6) {
			if (this.matInfos.length > 0) {
			this.matInfos = [];
			}
			}
			this.matInfos.push(res.data);
			if (res.message) {
			this.$refs.uToast.show({
			title: res.message,
			type: "error"
			})
			// setTimeout(this.updateFocus,200);
			setTimeout(() => {
			this.voiceSpeech('../../static/fail.mp3');
			}, 100);
			return;
			}
			// setTimeout(this.updateFocus,200);
			setTimeout(() => {
			this.voiceSpeech('../../static/success.mp3');
			}, 100);
			} else {
			// this.innerCode = "";
			this.$refs.uToast.show({
			title: res.message,
			type: "error"
			})
			// setTimeout(this.updateFocus,200);
			setTimeout(() => {
			this.voiceSpeech('../../static/fail.mp3');
			}, 100);
			@@ -456,15 +468,30 @@
			if (this.Test) {
			if (!this.Testcheck) {
			this.Testcheck = true;
			if (this.warehouseId == 2) {
			this.$refs.uToast.show({
			title: "è¯·ç¡®è®¤æ°é",
			type: 'error'
			})
			} else if (this.warehouseId == 6) {
			this.$refs.uToast.show({
			title: "è¯·ç¡®è®¤åå§å¯¿å½",
			type: 'error'
			})
			}
			return;
			}
			}

			let url = 'palletCode=' + this.barcode + '&initiallife=' + this.Initiallife + '&warehouseId=' + this.warehouseId;
			if (this.warehouseId == 2) { //æ²¹å¢¨ä»åºåºID
			this.sn = this.sns[0];
			debugger
			for (var i = 0; i < this.Initiallife - 1; i++) {
			this.sns.push(this.sn);
			}
			}
			debugger
			let url = 'palletCode=' + this.barcode + '&initiallife=' + this.Initiallife + '&warehouseId=' + this
			.warehouseId;

			this.$u.post('/api/InboundOrder/ManualMaterielGroup?' + url, this.sns).then(res => {
			this.Testcheck = false;

			@@ -16,9 +16,12 @@
			<uni-easyinput type="text" placeholder="è¯·æ«æåç®±æ ç¾" ref='midInput' :focus="focus"
			v-model="materSn" @input="snInput" />
			</uni-forms-item>
			<uni-forms-item label="åå§å¯¿å½:" v-if="Test">
			<uni-easyinput type="text" placeholder="è¯·è¾å¥åå§å¯¿å½" ref='midInput' v-model="Initiallife" />

			<uni-forms-item :label="Testlabel" v-if="Test">
			<uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
			v-model="Initiallife" />
			</uni-forms-item>

			<!-- <uni-forms-item>
			<checkbox checked="check">æ¯å¦æ»¡ç</checkbox>
			</uni-forms-item> -->
			@@ -178,6 +181,8 @@
			matTotals: [],
			warehouseId: "",
			Test: false,
			Testlabel: "",
			Testplaceholder: "",
			Testcheck: false,
			}
			},
			@@ -187,7 +192,16 @@
			this.addressFocus = false;
			this.orderNo = res.orderNo;
			this.warehouseId = res.warehouseId;
			this.Test = this.warehouseId == 6; //æµè¯æ¶ä»åºåºID
			if (this.warehouseId == 6) { //æµè¯æ¶ä»åºåºID
			this.Test = true;
			this.Testlabel = "åå§å¯¿å½:";
			this.Testplaceholder = "è¯·è¾å¥åå§å¯¿å½";
			} else if (this.warehouseId == 2) { //æ²¹å¢¨ä»åºåºID
			this.Test = true;
			this.Testlabel = "æ°é:";
			this.Testplaceholder = "è¯·è¾å¥æ°é";
			this.Initiallife = 16;
			}
			this.label = "åæ®ç¼å·ï¼" + this.orderNo;
			this.getData();
			},
			@@ -486,27 +500,8 @@
			})
			},
			deleteList(res) {
			// var sn = '';

			this.matInfos.splice(res, 1);
			this.sns.splice(res, 1);
			// this.matInfos.map((item, index) => {
			// if (item.sn == res) {
			// this.matInfos.splice(index, 1);
			// sn = item.sn;
			// var tmp = this.matTotal.find(x => x.matCode == item.matCode);
			// if (tmp) {
			// tmp.matQuantity -= parseInt(item.quantity);
			// } else {

			// }
			// }
			// })
			// this.sns.map((item, index) => {
			// if (item == res) {
			// this.sns.splice(index, 1);
			// }
			// })
			},
			submit() {
			if (this.barcode == "") {