root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:内包间取放货点位查询优化

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-12-28 09:27:30 +08:00
parent 9b9374de04
commit 1a1f45c950
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -957,8 +957,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//纸管任务 //纸管任务
String task_code2 = whereJson.getString("task_code2"); String task_code2 = whereJson.getString("task_code2");
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code1 + "'").uniqueResult(0); JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code1 + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(task_jo)){
throw new BadRequestException("接口sendGetGoalStruct，任务号为空！");
}
JSONObject task_jo2 = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code2 + "'").uniqueResult(0); JSONObject task_jo2 = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code2 + "'").uniqueResult(0);
String product_area = task_jo.getString("product_area"); String product_area = task_jo.getString("product_area");
String public_area = "";
if (product_area.equals("A1") || product_area.equals("A2")){
public_area = "A1";
}
if (product_area.equals("A3") || product_area.equals("A4")){
public_area = "A3";
}
JSONObject cbz_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("product_area = '" + product_area + "' AND point_type = '0'").uniqueResult(0); JSONObject cbz_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("product_area = '" + product_area + "' AND point_type = '0'").uniqueResult(0);
String cbz_size = cbz_jo.getString("qzz_size"); String cbz_size = cbz_jo.getString("qzz_size");
String cbz_generation = cbz_jo.getString("qzz_generation"); String cbz_generation = cbz_jo.getString("qzz_generation");
@@ -1093,6 +1103,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
struct_jo = WQL.getWO("QAUTO_QUERY").addParam("flag", "6") struct_jo = WQL.getWO("QAUTO_QUERY").addParam("flag", "6")
.addParam("need_size", need_size) .addParam("need_size", need_size)
.addParam("need_generation", need_generation) .addParam("need_generation", need_generation)
.addParam("product_area",public_area)
.process().uniqueResult(0); .process().uniqueResult(0);
if (ObjectUtil.isEmpty(struct_jo)) { if (ObjectUtil.isEmpty(struct_jo)) {
@@ -1116,6 +1127,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
struct_jo = WQL.getWO("QAUTO_QUERY").addParam("flag", "7") struct_jo = WQL.getWO("QAUTO_QUERY").addParam("flag", "7")
.addParam("need_size", have_size) .addParam("need_size", have_size)
.addParam("need_generation", have_generation) .addParam("need_generation", have_generation)
.addParam("product_area",public_area)
.process().uniqueResult(0); .process().uniqueResult(0);
if (ObjectUtil.isEmpty(struct_jo)) { if (ObjectUtil.isEmpty(struct_jo)) {

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QAUTO_QUERY.wql
View File

@@ -198,9 +198,13 @@
AND AND
ivt.have_qzz = '1' ivt.have_qzz = '1'
AND AND
ivt.is_used = '1'
AND
ivt.qzz_size = 输入.need_size ivt.qzz_size = 输入.need_size
AND AND
ivt.qzz_generation = 输入.need_generation ivt.qzz_generation = 输入.need_generation
AND
ivt.product_area = 输入.product_area
ORDER BY ORDER BY
sort_seq sort_seq
ENDSELECT ENDSELECT
@@ -216,8 +220,10 @@
WHERE WHERE
ivt.point_type = '1' ivt.point_type = '1'
AND ivt.have_qzz = '0' AND ivt.have_qzz = '0'
AND ivt.is_used = '1'
AND ivt.qzz_size = 输入.need_size AND ivt.qzz_size = 输入.need_size
AND ivt.qzz_generation = 输入.need_generation AND ivt.qzz_generation = 输入.need_generation
AND ivt.product_area = 输入.product_area
AND NOT EXISTS AND NOT EXISTS
( SELECT ( SELECT
* *