From efe2e807436fab0ec2bacfa6105a219e72c48eac Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Thu, 6 Mar 2025 20:04:32 +0800 Subject: [PATCH] =?UTF-8?q?opt:1.=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E6=9F=A5=E8=AF=A2=EF=BC=9B2.=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=94=A8=E6=96=99=E5=8D=95=E5=AE=9E=E6=97=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0=EF=BC=9B?= =?UTF-8?q?=203.=E4=BC=98=E5=8C=96=E5=A4=B1=E8=B4=A5=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E5=AD=97=E6=AE=B5=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=B7=B7=E4=B9=B1=EF=BC=9B=204.=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E5=90=8C=E6=AD=A5=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=EF=BC=9B=205.?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=8D=95=E6=8D=AE=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=E5=AE=8C=E6=88=90=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/utils/ErpServiceUtils.java | 4 +-- .../controller/BmFormStrucController.java | 2 +- .../form_struc/service/dao/BmFormStruc.java | 5 +++- .../views/wms/stor_manage/record/index.vue | 25 +++++++++---------- .../wms/stor_manage/storIvtInfo/index.vue | 4 +-- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/ErpServiceUtils.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/ErpServiceUtils.java index 35092620..bb2197da 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/ErpServiceUtils.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/ErpServiceUtils.java @@ -153,8 +153,8 @@ public class ErpServiceUtils { //执行回传 try { String json = from.toJSONString(); - result = getCloudApi().audit(from.getString("formid"), json); - from.put("result", result); +// result = getCloudApi().audit(from.getString("formid"), json); +// from.put("result", result); } catch (Exception ex) { Log.error(ex.getMessage()); from.put("result", ex.getMessage()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java index 87b77032..72db5feb 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java @@ -126,7 +126,7 @@ public class BmFormStrucController { @GetMapping("/getParentFormTypes/{desc}") public ResponseEntity getParentFormTypes(@PathVariable String desc){ //参数判读，参数解析，调用参数入库 - QueryWrapper queryWrapper = new QueryWrapper().select("form_type", "form_name").isNull("parent_id").groupBy("form_type"); + QueryWrapper queryWrapper = new QueryWrapper().select("form_type", "form_name").isNull("parent_id").groupBy("form_type").orderByAsc("sort"); if (StringUtils.isNotEmpty(desc)){ queryWrapper.like("form_desc",desc); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java index 8d5d4ea6..8ea29ba2 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java @@ -154,5 +154,8 @@ public class BmFormStruc implements Serializable { */ private String bar_code; - + /** + * 条码 + */ + private String sort; } diff --git a/wms_pro/qd/src/views/wms/stor_manage/record/index.vue b/wms_pro/qd/src/views/wms/stor_manage/record/index.vue index a00e004d..ebced7da 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/record/index.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/record/index.vue @@ -78,27 +78,26 @@ - - - - - + + - - - - - + + + + - + + + + diff --git a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue index c7d96674..8dd2e844 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue @@ -46,12 +46,12 @@ class="filter-item" /> - +