From b884a7164ee584c7433a70fbec74777a5a0a8ecf Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Mon, 13 Oct 2025 10:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=A8=E9=80=81=E8=A7=A3?= =?UTF-8?q?=E8=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RuoYi-App-master/pages/in/bindMsg.vue | 60 +- .../api/controller/ToWcsApiController.java | 18 +- .../api/controller/ToWmsApiController.java | 11 + .../com/ruoyi/api/domain/SsjTaskNoParam.java | 13 + .../com/ruoyi/api/service/IToWcsService.java | 1 + .../com/ruoyi/api/service/IToWmsService.java | 4 + .../api/service/impl/ToWcsServiceImpl.java | 30 +- .../api/service/impl/ToWmsServiceImpl.java | 101 +- .../service/impl/CheckStockinServiceImpl.java | 2 +- .../service/impl/MydoJobServiceImpl.java | 2 +- .../service/impl/OutStockoutServiceImpl.java | 2 +- .../out/tagTask/thread/TagInReadThread.java | 4 +- .../com/ruoyi/pda/service/PdaServiceImp.java | 10 +- ruoyi-ui/src/lang/en.js | 1895 ++++++++--------- 14 files changed, 1088 insertions(+), 1065 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/api/domain/SsjTaskNoParam.java diff --git a/RuoYi-App-master/pages/in/bindMsg.vue b/RuoYi-App-master/pages/in/bindMsg.vue index dc504d9..0932c49 100644 --- a/RuoYi-App-master/pages/in/bindMsg.vue +++ b/RuoYi-App-master/pages/in/bindMsg.vue @@ -75,7 +75,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -174,7 +174,7 @@ selectedEntrance: '', selectedEntranceId: '', selectedEntranceIndex: 0, - + } }, onReady() { @@ -183,8 +183,8 @@ this.$refs.trayCodeInput.onFocus() }) }, 100) - - + + }, methods: { // 根据仓库ID获取入口列表 @@ -193,7 +193,7 @@ this.selectedEntrance = '' this.selectedEntranceId = '' this.selectedEntranceIndex = 0 - + if (warehouseId === '02') { this.entranceList = [ { id: 'G1001', name: 'G1001' }, @@ -202,11 +202,13 @@ } else if (warehouseId === '13') { this.entranceList = [ { id: 'G3006', name: 'G3006' }, - { id: 'G1001', name: 'G1001' } + { id: 'G2007', name: 'G2007' }, + { id: 'G4006', name: 'G4006' }, + { id: 'G5006', name: 'G5006' } ] } }, - + // 处理货位选择 async handleRecommendCargoSpace() { // try { @@ -268,14 +270,14 @@ }) return } - + try { const response = await addInJob({ cargoSpaceId: this.cargoSpaceId, trayCode: this.trayCode, warehouseId: this.materialList[0].warehouseId }) - + if (response.code === 200) { uni.showToast({ title: this.$t('inbound.bindMsg.inboundSuccess'), @@ -324,7 +326,7 @@ async fetchTrayInfo(trayCode) { try { const response = await getTrayInfo(trayCode) - + if (response.code===200) { if(response.data.length>0){ @@ -332,7 +334,7 @@ }else{ this.materialList=[] } - + } else { uni.showToast({ title: response.msg || this.$t('inbound.bindMsg.getTrayInfoFailed'), @@ -362,7 +364,7 @@ if (warehouseType === '1') { // 显示货位选择弹出框 this.$refs.cargoSpacePopup.open() - + } else { // 非货位类型仓库,显示入口选择弹出框 this.getEntranceListByWarehouseId(warehouseId) @@ -428,7 +430,7 @@ trayCode: this.trayCode, warehouseId: this.materialList[0].warehouseId }) - + if (response.code === 200) { uni.showToast({ title: this.$t('inbound.bindMsg.inboundSuccess'), @@ -459,7 +461,7 @@ warehouseId: this.materialList[0].warehouseId, entranceId: this.selectedEntranceId }) - + if (response.code === 200) { uni.showToast({ title: this.$t('inbound.bindMsg.inboundSuccess'), @@ -503,7 +505,7 @@ if (this.subOrderInfo) { this.$refs.subOrderPopup.open() } - + } }, // 处理子单据清除事件 @@ -579,7 +581,7 @@ icon: 'none' }) } - + const response = await bindTray({ trayCode: this.trayCode, @@ -597,7 +599,7 @@ this.subOrderInfo = null this.inQuantity='' this.fetchTrayInfo(this.trayCode) - + } else { uni.showToast({ title: response.msg || this.$t('inbound.bindMsg.bindFailed'), @@ -621,7 +623,7 @@ trayCode: this.trayCode, stockinDetailId: stockinDetailId }) - + if (response.code === 200) { uni.showToast({ title: this.$t('inbound.bindMsg.unbindSuccess'), @@ -644,7 +646,7 @@ } } } - +