From 0ba8940acff1c76285bd9520708af1ce6ad4d386 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 16 May 2023 18:41:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=AB=8B=E5=BA=93=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mnt/service/impl/AutoRiKuServiceImpl.java | 75 ++++++++++++++----- .../java/org/nl/modules/mnt/wql/AUTORIKU.wql | 69 +++++++++++++++++ .../service/impl/StructattrServiceImpl.java | 17 +++++ .../wms/basedata/st/wql/QST_STRUCT_ATTR.wql | 4 + .../acs/service/impl/WmsToAcsServiceImpl.java | 18 ++++- .../editor/components/node/html/htmlNode.js | 4 + .../system/logicflow/editor/image/red.svg | 1 + .../src/views/wms/agvrush/charge/index.vue | 12 ++- .../src/views/wms/pub/StructDialog.vue | 58 +++++++------- .../src/views/wms/riku/rikuone/index.vue | 49 +++++++++++- .../src/views/wms/riku/rikustat/PieChart.vue | 10 +++ .../src/views/wms/riku/rikutthree/index.vue | 13 +++- .../src/views/wms/riku/rikutwo/index.vue | 13 +++- .../wms/st/inStor/moveStor/AddDialog.vue | 7 +- .../views/wms/st/inStor/moveStor/AddDtl.vue | 52 +++++++++---- 15 files changed, 326 insertions(+), 76 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/modules/mnt/wql/AUTORIKU.wql create mode 100644 lms/nladmin-ui/src/views/system/logicflow/editor/image/red.svg diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java index 294252fdc..712df3106 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java @@ -1,12 +1,20 @@ package org.nl.modules.mnt.service.impl; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.nl.modules.mnt.service.AutoRiKuService; +import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.util.List; +import java.util.stream.Collectors; + @Service @RequiredArgsConstructor public class AutoRiKuServiceImpl implements AutoRiKuService { @@ -18,21 +26,22 @@ public class AutoRiKuServiceImpl implements AutoRiKuService { JSONArray dataArr = new JSONArray(); // 获取有货货位 - JSONArray haveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') <> '' and layer_num = '1' and is_delete = '0'").getResultJSONArray(0); + JSONArray haveArr = WQL.getWO("AUTORIKU").addParam("flag", "1").addParam("layer_num", "1").process().getResultJSONArray(0); + JSONObject jsonHave = new JSONObject(); jsonHave.put("name", "有货"); jsonHave.put("value", haveArr.size()); // 获取无货货位 - JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') = '' and layer_num = '1' and is_delete = '0'").getResultJSONArray(0); + JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01','FTD01') and IFNULL(storagevehicle_code,'') = '' and layer_num = '1' and is_delete = '0'").getResultJSONArray(0); JSONObject jsonNotHave = new JSONObject(); jsonNotHave.put("name", "空闲"); jsonNotHave.put("value", notHaveArr.size()); // 获取禁用货位 - JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and layer_num = '1' and is_delete = '0'").getResultJSONArray(0); + JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01','FTD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and layer_num = '1' and is_delete = '0'").getResultJSONArray(0); JSONObject jsonUsed = new JSONObject(); jsonUsed.put("name", "禁用"); @@ -43,7 +52,15 @@ public class AutoRiKuServiceImpl implements AutoRiKuService { dataArr.add(jsonUsed); int num = haveArr.size() + notHaveArr.size() + usedArr.size(); - jsonAll.put("pieSubTest", "总仓位:"+num); + + // 获取净重 + BigDecimal net_weight = haveArr.stream() + .map(row -> (JSONObject) row) + .filter(row -> !StrUtil.equals(row.getString("sect_code"), "KTP01") && ObjectUtil.isNotEmpty(row.getString("net_weight"))) + .map(row -> row.getBigDecimal("net_weight")) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + jsonAll.put("pieSubTest", "总仓位: "+num+" "+"总净重: "+ NumberUtil.round(net_weight,2)+"KG"); jsonAll.put("data", dataArr); jsonAll.put("name", "立库1层统计"); @@ -58,21 +75,21 @@ public class AutoRiKuServiceImpl implements AutoRiKuService { JSONArray dataArr = new JSONArray(); // 获取有货货位 - JSONArray haveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') <> '' and layer_num = '2' and is_delete = '0'").getResultJSONArray(0); + JSONArray haveArr = WQL.getWO("AUTORIKU").addParam("flag", "1").addParam("layer_num", "2").process().getResultJSONArray(0); JSONObject jsonHave = new JSONObject(); jsonHave.put("name", "有货"); jsonHave.put("value", haveArr.size()); // 获取无货货位 - JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') = '' and layer_num = '2' and is_delete = '0'").getResultJSONArray(0); + JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01','FTD01') and IFNULL(storagevehicle_code,'') = '' and layer_num = '2' and is_delete = '0'").getResultJSONArray(0); JSONObject jsonNotHave = new JSONObject(); jsonNotHave.put("name", "空闲"); jsonNotHave.put("value", notHaveArr.size()); // 获取禁用货位 - JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and layer_num = '2' and is_delete = '0'").getResultJSONArray(0); + JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01','FTD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and layer_num = '2' and is_delete = '0'").getResultJSONArray(0); JSONObject jsonUsed = new JSONObject(); jsonUsed.put("name", "禁用"); @@ -83,7 +100,15 @@ public class AutoRiKuServiceImpl implements AutoRiKuService { dataArr.add(jsonUsed); int num = haveArr.size() + notHaveArr.size() + usedArr.size(); - jsonAll.put("pieSubTest", "总仓位:"+num); + + // 获取净重 + BigDecimal net_weight = haveArr.stream() + .map(row -> (JSONObject) row) + .filter(row -> !StrUtil.equals(row.getString("sect_code"), "KTP01") && ObjectUtil.isNotEmpty(row.getString("net_weight"))) + .map(row -> row.getBigDecimal("net_weight")) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + jsonAll.put("pieSubTest", "总仓位: "+num+" "+"总净重: "+ NumberUtil.round(net_weight,2)+"KG"); jsonAll.put("data", dataArr); jsonAll.put("name", "立库2层统计"); @@ -98,21 +123,20 @@ public class AutoRiKuServiceImpl implements AutoRiKuService { JSONArray dataArr = new JSONArray(); // 获取有货货位 - JSONArray haveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') <> '' and layer_num = '3' and is_delete = '0'").getResultJSONArray(0); - + JSONArray haveArr = WQL.getWO("AUTORIKU").addParam("flag", "1").addParam("layer_num", "3").process().getResultJSONArray(0); JSONObject jsonHave = new JSONObject(); jsonHave.put("name", "有货"); jsonHave.put("value", haveArr.size()); // 获取无货货位 - JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') = '' and layer_num = '3' and is_delete = '0'").getResultJSONArray(0); + JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01','FTD01') and IFNULL(storagevehicle_code,'') = '' and layer_num = '3' and is_delete = '0'").getResultJSONArray(0); JSONObject jsonNotHave = new JSONObject(); jsonNotHave.put("name", "空闲"); jsonNotHave.put("value", notHaveArr.size()); // 获取禁用货位 - JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and layer_num = '3' and is_delete = '0'").getResultJSONArray(0); + JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01','FTD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and layer_num = '3' and is_delete = '0'").getResultJSONArray(0); JSONObject jsonUsed = new JSONObject(); jsonUsed.put("name", "禁用"); @@ -123,7 +147,15 @@ public class AutoRiKuServiceImpl implements AutoRiKuService { dataArr.add(jsonUsed); int num = haveArr.size() + notHaveArr.size() + usedArr.size(); - jsonAll.put("pieSubTest", "总仓位:"+num); + + // 获取净重 + BigDecimal net_weight = haveArr.stream() + .map(row -> (JSONObject) row) + .filter(row -> !StrUtil.equals(row.getString("sect_code"), "KTP01") && ObjectUtil.isNotEmpty(row.getString("net_weight"))) + .map(row -> row.getBigDecimal("net_weight")) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + jsonAll.put("pieSubTest", "总仓位: "+num+" "+"总净重: "+ NumberUtil.round(net_weight,2)+"KG"); jsonAll.put("data", dataArr); jsonAll.put("name", "立库3层统计"); @@ -138,21 +170,20 @@ public class AutoRiKuServiceImpl implements AutoRiKuService { JSONArray dataArr = new JSONArray(); // 获取有货货位 - JSONArray haveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') <> '' and is_delete = '0'").getResultJSONArray(0); - + JSONArray haveArr = WQL.getWO("AUTORIKU").addParam("flag", "1").process().getResultJSONArray(0); JSONObject jsonHave = new JSONObject(); jsonHave.put("name", "有货"); jsonHave.put("value", haveArr.size()); // 获取无货货位 - JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and IFNULL(storagevehicle_code,'') = '' and is_delete = '0'").getResultJSONArray(0); + JSONArray notHaveArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01','FTD01') and IFNULL(storagevehicle_code,'') = '' and is_delete = '0'").getResultJSONArray(0); JSONObject jsonNotHave = new JSONObject(); jsonNotHave.put("name", "空闲"); jsonNotHave.put("value", notHaveArr.size()); // 获取禁用货位 - JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and is_delete = '0'").getResultJSONArray(0); + JSONArray usedArr = attrTab.query("sect_code in ('ZC01','KTP01','ZZ01','PD01','FTD01') and is_used = '0' and IFNULL(storagevehicle_code,'') = '' and is_delete = '0'").getResultJSONArray(0); JSONObject jsonUsed = new JSONObject(); jsonUsed.put("name", "禁用"); @@ -163,7 +194,15 @@ public class AutoRiKuServiceImpl implements AutoRiKuService { dataArr.add(jsonUsed); int num = haveArr.size() + notHaveArr.size() + usedArr.size(); - jsonAll.put("pieSubTest", "总仓位:"+num); + + // 获取净重 + BigDecimal net_weight = haveArr.stream() + .map(row -> (JSONObject) row) + .filter(row -> !StrUtil.equals(row.getString("sect_code"), "KTP01") && ObjectUtil.isNotEmpty(row.getString("net_weight"))) + .map(row -> row.getBigDecimal("net_weight")) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + jsonAll.put("pieSubTest", "总仓位: "+num+" "+"总净重: "+ NumberUtil.round(net_weight,2)+"KG"); jsonAll.put("data", dataArr); jsonAll.put("name", "立库汇总统计"); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/wql/AUTORIKU.wql b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/wql/AUTORIKU.wql new file mode 100644 index 000000000..e082f0d57 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/wql/AUTORIKU.wql @@ -0,0 +1,69 @@ +[交易说明] + 交易名： 立库监控 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.layer_num TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + IF 输入.flag = "1" + QUERY + SELECT + attr.*, + sub.net_weight + FROM + st_ivt_structattr attr + LEFT JOIN ( + SELECT + SUM(net_weight) AS net_weight, + package_box_sn + FROM + pdm_bi_subpackagerelation + WHERE + 1 = 1 + group by package_box_sn + ) sub ON attr.storagevehicle_code = sub.package_box_sn + WHERE + attr.sect_code in ('ZC01','KTP01','ZZ01','PD01','FTD01') + and IFNULL(attr.storagevehicle_code,'') <> '' + and attr.is_delete = '0' + + OPTION 输入.layer_num <> "" + attr.layer_num = 输入.layer_num + ENDOPTION + + ENDSELECT + ENDQUERY + ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java index 72ec5e9c8..80b68f522 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java @@ -28,9 +28,11 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author zhouz @@ -58,6 +60,7 @@ public class StructattrServiceImpl implements StructattrService { map.put("stor_id", (String) whereJson.get("stor_id")); map.put("sect_id", (String) whereJson.get("sect_id")); map.put("lock_type", (String) whereJson.get("lock_type")); + map.put("layer_num", (String) whereJson.get("layer_num")); //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); @@ -264,6 +267,17 @@ public class StructattrServiceImpl implements StructattrService { .addParamMap(MapOf.of("struct_id", struct_id, "flag", "1")) .process() .getResultJSONArray(0); + // 计算合计 + JSONObject json = array.getJSONObject(0); + if (ObjectUtil.isNotEmpty(json.getString("net_weight"))) { + BigDecimal container_weight = array.stream().map(row -> ((JSONObject) row).getBigDecimal("net_weight")).reduce(BigDecimal.ZERO, BigDecimal::add); + + for (int j = 0; j < array.size(); j++) { + JSONObject jsonObject = array.getJSONObject(j); + jsonObject.put("container_weight",container_weight); + } + } + // 获取仓位表中的信息 JSONObject strInfo = attrTab .query("struct_id = '" + struct_id + "'") @@ -271,6 +285,9 @@ public class StructattrServiceImpl implements StructattrService { if (strInfo.getString("is_used").equals("0")) { // 被禁用 struct_status = 4; + } else if (strInfo.getString("sect_code").equals("PD01")) { + // 盘点位 + struct_status = 5; } else if (ObjectUtil.isEmpty(strInfo.getString("storagevehicle_code"))) { // 空位 struct_status = 3; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql index 0dc567b28..f5c2eff71 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql @@ -22,6 +22,7 @@ 输入.is_used TYPEAS s_string 输入.is_delete TYPEAS s_string 输入.have_vehicle TYPEAS s_string + 输入.layer_num TYPEAS s_string 输入.in_stor_id TYPEAS f_string [临时表] @@ -71,6 +72,9 @@ OPTION 输入.lock_type <> "" struct.lock_type = 输入.lock_type ENDOPTION + OPTION 输入.layer_num <> "" + struct.layer_num = 输入.layer_num + ENDOPTION OPTION 输入.lock_type = "1" (struct.storagevehicle_code is null or struct.storagevehicle_code = '') ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 8cffb0fe3..54ef02c8c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -1,5 +1,6 @@ package org.nl.wms.ext.acs.service.impl; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSONArray; @@ -169,7 +170,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { result.put("message", "下发成功，但未连接ACS!"); result.put("data", new JSONArray()); - /* // 测试数据 + // 测试数据 JSONArray data = result.getJSONArray("data"); JSONObject a = new JSONObject(); a.put("electricity", "86"); @@ -199,9 +200,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { JSONArray ArrA1 = new JSONArray(); // A1车间 JSONArray ArrLk = new JSONArray(); // LK车间 + String run_time = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("AGV_RUN_TIME").getValue(); + for (int i = 0; i < data.size(); i++) { JSONObject json = data.getJSONObject(i); + // 工作时长：电量百分比*6 + String electricity = json.getString("electricity"); + json.put("run_time", NumberUtil.round(NumberUtil.div(NumberUtil.mul(electricity, run_time),100), 1)); + if ("2,3".contains(json.getString("car_no"))) { ArrA1.add(json); } @@ -211,7 +218,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { } nowJson.put("jsonA1",ArrA1); nowJson.put("jsonLK",ArrLk); - result.put("data", nowJson);*/ + result.put("data", nowJson); return result; } @@ -233,9 +240,16 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { JSONArray ArrA1 = new JSONArray(); // A1车间 JSONArray ArrLk = new JSONArray(); // LK车间 + String run_time = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("AGV_RUN_TIME").getValue(); + + for (int i = 0; i < data.size(); i++) { JSONObject json = data.getJSONObject(i); + // 工作时长：电量百分比*6 + String electricity = json.getString("electricity"); + json.put("run_time", NumberUtil.round(NumberUtil.div(NumberUtil.mul(electricity, run_time),100), 1)); + if ("2,3".contains(json.getString("car_no"))) { ArrA1.add(json); } diff --git a/lms/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js b/lms/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js index 9f541d8e4..5efdfbae7 100644 --- a/lms/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js +++ b/lms/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js @@ -6,6 +6,7 @@ import green from '../../../image/green.svg' import yellow from '../../../image/yellow.svg' import grey from '../../../image/grey.svg' import blue from '../../../image/blue.svg' +import red from '../../../image/red.svg' class ButtonNodeModel extends HtmlResize.model { initNodeData(data) { @@ -47,6 +48,9 @@ class ButtonNode extends HtmlResize.view { case 4: imageUrl = grey break + case 5: + imageUrl = red + break default: break } diff --git a/lms/nladmin-ui/src/views/system/logicflow/editor/image/red.svg b/lms/nladmin-ui/src/views/system/logicflow/editor/image/red.svg new file mode 100644 index 000000000..257610237 --- /dev/null +++ b/lms/nladmin-ui/src/views/system/logicflow/editor/image/red.svg @@ -0,0 +1 @@ + diff --git a/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue b/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue index a5e491d5d..e394ceab4 100644 --- a/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue +++ b/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue @@ -33,7 +33,7 @@ -
+
+ +
+ + 运行时长： + + + {{ agvObj.run_time }} + +
+
- - + + - - + + + /> + - - - - + + { this.sects = res.content }) - if (this.sect) { - this.query.sect = this.sect - if (this.sect.length === 1) { - this.query.stor_id = this.sect[0] - this.query.stor_id = this.storId - } - if (this.sect.length === 0) { - this.query.sect_id = '' - this.query.stor_id = '' - } - if (this.sect.length === 2) { - this.query.stor_id = this.sect[0] - this.query.sect_id = this.sect[1] - } - } this.query.is_lock = '1' this.query.lock_type = this.lock this.query.is_used = '1' - debugger - this.query.stor_id = this.storId this.crud.toQuery() }, handleSelectionChange(val, row) { @@ -182,6 +179,7 @@ export default { this.crud.query.stor_id = val[0] this.crud.query.sect_id = val[1] } + this.crud.toQuery() }, onSelectAll() { this.$refs.table.clearSelection() diff --git a/lms/nladmin-ui/src/views/wms/riku/rikuone/index.vue b/lms/nladmin-ui/src/views/wms/riku/rikuone/index.vue index 34ac82a40..363acbfd8 100644 --- a/lms/nladmin-ui/src/views/wms/riku/rikuone/index.vue +++ b/lms/nladmin-ui/src/views/wms/riku/rikuone/index.vue @@ -1,5 +1,31 @@ @@ -243,7 +243,7 @@ import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' const defaultForm = { bill_code: '', - stor_id: '', + stor_id: '1582991156504039424', stor_code: '', stor_name: '', bill_status: '10', @@ -278,6 +278,7 @@ export default { nowindex: '', storlist: [], invtypelist: [], + layer_num: null, rules: { stor_id: [ { required: true, message: '仓库不能为空', trigger: 'blur' } @@ -350,6 +351,7 @@ export default { this.form.stor_name = item.stor_name } }) + this.form.tableData = [] }, async queryDtl() { if (!this.form.stor_id) { @@ -359,6 +361,7 @@ export default { this.dtlShow = true }, async queryStruct(index, row) { + this.layer_num = row.turnout_struct_code.charAt(row.turnout_struct_code.length - 1) this.structShow = true this.$refs.child.getMsg(false) this.nowindex = index diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue index 4d27080f7..ad139b5bd 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue @@ -9,18 +9,36 @@ @close="close" @open="open" > - - - + + + - - + + + + + - - + + - - + + - - - - - - + + +
{ @@ -186,6 +205,7 @@ export default { this.crud.query.stor_id = val[0] this.crud.query.sect_id = val[1] } + this.crud.toQuery() }, submit() { debugger