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" /> - +