From 22f38f80cf74f2a81e1cfdd527217f94e40f0f15 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Sun, 9 Oct 2022 17:00:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=98=E7=83=A4=E5=8C=BA=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HotPointIvtServiceImpl.java | 17 +- .../nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql | 4 +- .../org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql | 74 +++++++ .../views/wms/pdm/ivt/hotpointivt/index.vue | 182 +++++++++++++----- 4 files changed, 225 insertions(+), 52 deletions(-) create mode 100644 nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java index 3d602df77..5aae32354 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java @@ -12,7 +12,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.pdm.ivt.service.HotPointIvtService; @@ -21,6 +21,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,9 +37,17 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { @Override public Map queryAll(Map whereJson, Pageable page){ - WQLObject wo = WQLObject.getWQLObject("st_ivt_hotpointivt"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); - final JSONObject json = rb.pageResult(); + HashMap map = new HashMap(); + map.put("flag", "1"); + if (whereJson.get("point_code")!=null) + map.put("point_code", "%" + whereJson.get("point_code") + "%"); + map.put("point_status", whereJson.get("point_status")); + map.put("product_area", whereJson.get("product_area")); + map.put("is_used", whereJson.get("is_used")); + map.put("begin_time", whereJson.get("begin_time")); + map.put("end_time", whereJson.get("end_time")); + + JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); return json; } diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql index d3356af1b..ab24157b3 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql @@ -76,9 +76,9 @@ is_used = 输入.is_used ENDOPTION OPTION 输入.begin_time <> "" - instorage_time => 输入.begin_time + instorage_time >= 输入.begin_time ENDOPTION - OPTION 输入.end_tiem <> "" + OPTION 输入.end_time <> "" instorage_time <= 输入.end_time ENDOPTION ENDSELECT diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql new file mode 100644 index 000000000..89bf9e09f --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql @@ -0,0 +1,74 @@ +[交易说明] + 交易名： 烘烤区点位库存 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.point_code TYPEAS s_string + 输入.point_status TYPEAS s_string + 输入.product_area TYPEAS s_string + 输入.is_used TYPEAS s_string + 输入.begin_time TYPEAS s_string + 输入.end_time TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + IF 输入.flag = "1" + PAGEQUERY + SELECT + hot.* + FROM + st_ivt_hotpointivt hot + WHERE + 1=1 + OPTION 输入.point_code <> "" + point_code LIKE 输入.point_code + ENDOPTION + OPTION 输入.point_status <> "" + point_status = 输入.point_status + ENDOPTION + OPTION 输入.product_area <> "" + product_area = 输入.product_area + ENDOPTION + OPTION 输入.is_used <> "" + is_used = 输入.is_used + ENDOPTION + OPTION 输入.begin_time <> "" + instorage_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + instorage_time <= 输入.end_time + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF \ No newline at end of file diff --git a/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue b/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue index 19ebc4e4d..da964c872 100644 --- a/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue +++ b/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue @@ -2,52 +2,117 @@
+
+ + + + + + + + + + + + + + + + + + + + + + + +
- - + + - + - + + + - - - - + - - - - - - - - - - + - - - - - - - - - - - - - +
@@ -59,17 +124,33 @@ - - + + + + + + - + - + + + - + + + @@ -77,6 +158,7 @@ @@ -99,9 +181,23 @@ const defaultForm = { ivt_id: null, point_code: null, point_status: null, contai export default { name: 'HotPointIvt', components: { pagination, crudOperation, rrOperation, udOperation }, + dicts: ['sch_point_status', 'product_area', 'is_used', 'point_location'], mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { - return CRUD({ title: '烘烤区点位库存', url: 'api/hotpointivt', idField: 'ivt_id', sort: 'ivt_id,desc', crudMethod: { ...crudHotpointivt }}) + return CRUD({ + title: '烘烤区点位库存', + url: 'api/hotpointivt', + idField: 'ivt_id', + sort: 'ivt_id,desc', + crudMethod: { ...crudHotpointivt }, + optShow: { + add: false, + edit: true, + del: false, + download: false, + reset: true + } + }) }, data() { return { @@ -113,15 +209,6 @@ export default { ], point_status: [ { required: true, message: '点位状态不能为空', trigger: 'blur' } - ], - ivt_qty: [ - { required: true, message: '库存数不能为空', trigger: 'blur' } - ], - sort_seq: [ - { required: true, message: '顺序号不能为空', trigger: 'blur' } - ], - is_used: [ - { required: true, message: '是否启用不能为空', trigger: 'blur' } ] }} }, @@ -129,6 +216,9 @@ export default { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { return true + }, + hand(value) { + this.crud.toQuery() } } }