From e20ab6f882c50552fc6d9b38571693722ec4c0c3 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 3 Jul 2024 18:54:57 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E7=9B=98=E7=82=B9=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=AD=97=E6=AE=B5=E5=87=BA=E4=B9=A6=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stor_manage/pick/service/PickingService.java | 5 ++++- .../dao/mapper/xml/StIvtStructattrMapper.xml | 1 + .../main/resources/config/application-dev3.yml | 4 ++-- .../stor_manage/warehouse/pick/TaskDialog.vue | 16 ++++++++-------- .../stor_manage/warehouse/pick/ViewDialog.vue | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java index 97df9209..58e7e1b3 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java @@ -116,7 +116,10 @@ public class PickingService { public void taskOpen(JSONObject form){ PmFormData mst = form.toJavaObject(PmFormData.class); if (StringUtils.isEmpty(mst.getProc_inst_id())){ - throw new BadRequestException("当前单据不存在流程实例id"); + throw new BadRequestException("下发失败：当前单据不存在流程实例id"); + } + if (!mst.getStatus().equals(StatusEnum.FORM_STATUS.code("已分配"))){ + throw new BadRequestException("下发失败：当前单据未分配或者一下发"); } PickingService pickingService = SpringContextHolder.getBean(this.getClass()); pickingService.disGroup(mst); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml index bcba20cf..eb3d393a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml @@ -119,6 +119,7 @@ left join md_pb_vehicleMater vm on struct.vehicle_code = vm.vehicle_code left join md_me_materialbase material on vm.material_id = material.material_id + struct.vehicle_code is not null and (struct.struct_code LIKE '%${query.search}%' or struct.struct_name LIKE '%${query.search}%') diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 052ad69e..ffb5d076 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -7,7 +7,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} password: ${DB_PWD:123456} @@ -22,7 +22,7 @@ spring: # 超时时间(以秒数为单位) remove-abandoned-timeout: 180 # 获取连接超时时间 - max-wait: 3000 + max-wait: 9000 # 连接有效性检测时间 time-between-eviction-runs-millis: 60000 # 连接在池中最小生存的时间 diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue index e4720ecd..5554cc31 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue @@ -191,7 +191,7 @@ - + @@ -282,7 +283,7 @@ export default { dtlCols: [], unitDict: [], disCols: [], - disFormData: [], + disFormData: {}, tableDtl: [], tabledis: [], vehicledis: [], @@ -320,7 +321,7 @@ export default { formstruc.getHeader("Picking_Task").then(res => { this.disCols = res res.forEach(a => { - this.disFormData[a.value,''] + this.$set(this.disFormData, a.value, '') }) }), measureunit.getSelect().then(res => { @@ -350,10 +351,9 @@ export default { dtl.source_form_id = this.currentDtl.id dtl.source_form_date = this.currentDtl.create_time dtl.parent_id = this.currentDtl.id - dtl.form_data = {} - this.disFormData.forEach(a => { - dtl.form_data[a.value,''] - }) + debugger + dtl.form_data = this.disFormData + this.tabledis.push(dtl) }, subRow(index){ diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/ViewDialog.vue index 62bb4e27..0c7cfe6d 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/ViewDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/ViewDialog.vue @@ -145,7 +145,7 @@