From 86fdd26bc122e425172fa8c17992cb762e505b4f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 8 Apr 2025 17:08:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99--=E9=A2=86=E6=96=99=E9=80=80=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenanceReceive/maintenanceReturnBound.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue index cf4689e9cb..d8678488aa 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue @@ -149,7 +149,7 @@ @@ -285,8 +285,8 @@ export default { row.warehouseName = '' row.warehouseSid = '' } - row.WareZoneName = '' - row.WareZoneSid = '' + row.wareZoneName = '' + row.wareZoneSid = '' row.wareAreaName = '' row.wareAreaSid = '' row.warehouseRackCode = '' @@ -302,11 +302,11 @@ export default { selectWareZoneName(row, val) { const choose = this.warehouseZoneList.filter((item) => item.sid === val) if (choose !== null && choose.length > 0) { - row.WareZoneName = choose[0].zoneName - row.WareZoneSid = choose[0].sid + row.wareZoneName = choose[0].zoneName + row.wareZoneSid = choose[0].sid } else { - row.WareZoneName = '' - row.WareZoneSid = '' + row.wareZoneName = '' + row.wareZoneSid = '' } row.wareAreaName = '' row.wareAreaSid = '' From d4bfc3fb31ef7cacd6e98c05a40663b675986c2d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 8 Apr 2025 17:15:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99--=E9=A2=86=E6=96=99=E9=80=80=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/maintenanceReceive/maintenanceReturnBound.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue index d8678488aa..b79d9937a5 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue @@ -150,7 +150,7 @@ @@ -340,7 +340,7 @@ export default { }) }, selectWarehouseAreaCode(row, val) { - const choose = this.warehouseRackList.filter((item) => item.sid === val) + const choose = this.warehouseRackList.filter((item) => item.areaCode === val) if (choose !== null && choose.length > 0) { row.warehouseRackCode = choose[0].areaCode row.warehouseRackSid = choose[0].sid From c80f3f64c90a14e4593361038d690adf78dd9b12 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 8 Apr 2025 17:19:43 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99--=E9=A2=86=E6=96=99=E9=80=80=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/maintenanceReceive/maintenanceReturnBound.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue index b79d9937a5..9fe4c6c97c 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue @@ -150,7 +150,7 @@ @@ -340,9 +340,9 @@ export default { }) }, selectWarehouseAreaCode(row, val) { - const choose = this.warehouseRackList.filter((item) => item.areaCode === val) + const choose = this.warehouseRackList.filter((item) => item.rackCode === val) if (choose !== null && choose.length > 0) { - row.warehouseRackCode = choose[0].areaCode + row.warehouseRackCode = choose[0].rackCode row.warehouseRackSid = choose[0].sid } else { row.warehouseRackCode = '' From baa6ec5692db7b4fde459fc63a421cf8bf373031 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Tue, 8 Apr 2025 17:28:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99=E9=80=80=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairInventorybillService.java | 6 +++++- .../java/com/yxt/wms/biz/base/wmswarehouserack/RackVo.java | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java index f498c71616..59bd2e90a9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java @@ -433,7 +433,10 @@ public class AsBusrepairInventorybillService extends MybatisBaseService Date: Tue, 8 Apr 2025 17:34:54 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E9=80=89=E6=8B=A9=E8=9E=8D=E8=B5=84?= =?UTF-8?q?=E5=B9=B3=E4=BB=93=E4=BB=98=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anruifinmanagement/fukuanshenqing/paymentAdd.vue | 8 ++++++-- .../fukuanshenqing/relation/closingPayment.vue | 4 +++- .../workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue | 8 ++++++-- .../fukuanguanli/relation/closingPayment.vue | 4 +++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue index 371f83930f..6d9aef59ea 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue @@ -602,8 +602,12 @@ export default { } }, handleSelect() { - this.viewState = 8 - this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid) + if (this.formobj.payCompanySid !== '') { + this.viewState = 8 + this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid, this.formobj.payCompanySid) + } else { + this.$message({ showClose: true, type: 'error', message: '请先选择付款单位' }) + } }, deleteEve(index) { this.formobj.eveList.splice(index, 1) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue index 2f48bccccd..b30038a4b4 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue @@ -68,6 +68,7 @@ export default { listLoading: false, listQuery: { params: { + payCompanySid: '', useOrgSid: '', sidList: [] }, @@ -131,8 +132,9 @@ export default { } }) }, - showData(value, createOrgSid) { + showData(value, createOrgSid, payCompanySid) { this.listQuery.params.useOrgSid = createOrgSid + this.listQuery.params.payCompanySid = payCompanySid const aa = [] // if (value.length > 0) { // for (var i = 0; i < value.length; i++) { diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue index 20aee48a85..a7e172997c 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue @@ -593,8 +593,12 @@ export default { } }, handleSelect() { - this.viewState = 8 - this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid) + if (this.formobj.payCompanySid !== '') { + this.viewState = 8 + this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid, this.formobj.payCompanySid) + } else { + this.$message({ showClose: true, type: 'error', message: '请先选择付款单位' }) + } }, deleteEve(index) { this.formobj.eveList.splice(index, 1) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue index 01d4fd0613..f5d22f42c6 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue @@ -68,6 +68,7 @@ export default { listLoading: false, listQuery: { params: { + payCompanySid: '', useOrgSid: '', sidList: [] }, @@ -131,8 +132,9 @@ export default { } }) }, - showData(value, createOrgSid) { + showData(value, createOrgSid, payCompanySid) { this.listQuery.params.useOrgSid = createOrgSid + this.listQuery.params.payCompanySid = payCompanySid const aa = [] // if (value.length > 0) { // for (var i = 0; i < value.length; i++) { From 9fa9a2c69fe2911433bbb0a695f9d7782025d56e Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Tue, 8 Apr 2025 17:38:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99=E9=80=80=E5=BA=932?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml index 41c0900fd7..591821edf0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml @@ -66,6 +66,7 @@ where rackCode =#{rackCode} and locationSid =#{locationSid} and isDelete=0