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

fix:MES相关接口优化

Browse Source
This commit is contained in:
zhouz
2024-07-13 11:40:16 +08:00
parent 3ea3481c33
commit 2c9b074efd
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -616,10 +616,12 @@ public class MesToLmsServiceImpl implements MesToLmsService {
} }
if (param.getString("PaperTubeDescription").contains("3.12")) { if (param.getString("PaperTubeDescription").contains("3.12")) {
qzz_generation = "4"; qzz_generation = "4";
} } else if (param.getString("PaperTubeDescription").contains("3.15")) {
if (param.getString("PaperTubeDescription").contains("3.15")) {
qzz_generation = "5"; qzz_generation = "5";
} else {
qzz_generation = "4";
} }
// 解析描述数组 // 解析描述数组
String[] tubeArray = param.getString("PaperTubeDescription").split("\\|"); String[] tubeArray = param.getString("PaperTubeDescription").split("\\|");
// 定义尺寸与长度 // 定义尺寸与长度
@@ -636,10 +638,12 @@ public class MesToLmsServiceImpl implements MesToLmsService {
} }
if (param.getString("FRPDescription").contains("3.12")) { if (param.getString("FRPDescription").contains("3.12")) {
qzz_generation = "4"; qzz_generation = "4";
} } else if (param.getString("FRPDescription").contains("3.15")) {
if (param.getString("FRPDescription").contains("3.15")) {
qzz_generation = "5"; qzz_generation = "5";
} else {
qzz_generation = "4";
} }
// 解析描述数组 // 解析描述数组
String[] tubeArray = param.getString("FRPDescription").split("\\|"); String[] tubeArray = param.getString("FRPDescription").split("\\|");
// 定义尺寸与长度 // 定义尺寸与长度
@@ -671,14 +675,14 @@ public class MesToLmsServiceImpl implements MesToLmsService {
json.put("split_breadth", SplitBreadth); json.put("split_breadth", SplitBreadth);
json.put("split_height", SplitHeight); json.put("split_height", SplitHeight);
json.put("split_weight", SplitWeight); json.put("split_weight", SplitWeight);
if (Attribute3.equals("U")){ if (Attribute3.equals("U")) {
json.put("up_or_down", "1"); json.put("up_or_down", "1");
}else { } else {
json.put("up_or_down", "2"); json.put("up_or_down", "2");
} }
if (Attribute4.equals("U")){ if (Attribute4.equals("L")) {
json.put("left_or_right", "1"); json.put("left_or_right", "1");
}else { } else {
json.put("left_or_right", "2"); json.put("left_or_right", "2");
} }
json.put("qzz_size", qzz_size); json.put("qzz_size", qzz_size);
@@ -1017,6 +1021,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
if (plan_jo.getString("up_or_down").equals("2")) { if (plan_jo.getString("up_or_down").equals("2")) {
cut_jo.put("down_qzzno", qzzNO); cut_jo.put("down_qzzno", qzzNO);
} }
plan_jo.put("qzzno", qzzNO);
WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo); WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo);
} }

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -728,6 +728,9 @@ public class BakingServiceImpl implements BakingService {
String in_area_id = userAreaService.getInArea(); String in_area_id = userAreaService.getInArea();
JSONObject jsonCool = coolIvtTab.query("full_point_code = '" + point_code + "'").uniqueResult(0); JSONObject jsonCool = coolIvtTab.query("full_point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonCool)) {
jsonCool = coolIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0);
}
if (ObjectUtil.isNotEmpty(jsonCool) && ObjectUtil.isNotEmpty(jsonCool.getString("container_name"))) { if (ObjectUtil.isNotEmpty(jsonCool) && ObjectUtil.isNotEmpty(jsonCool.getString("container_name"))) {
json.put("container_name", jsonCool.getString("container_name")); json.put("container_name", jsonCool.getString("container_name"));
String product_area = jsonCool.getString("product_area"); String product_area = jsonCool.getString("product_area");

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
View File

@@ -232,6 +232,9 @@ public class FeedingServiceImpl implements FeedingService {
} }
JSONObject cool_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code + "'").uniqueResult(0); JSONObject cool_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(cool_jo)) {
cool_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("point_code = '" + point_code + "'").uniqueResult(0);
}
if (ObjectUtil.isEmpty(cool_jo)) { if (ObjectUtil.isEmpty(cool_jo)) {
throw new BadRequestException("请输入或者扫描冷却区满轴位的点位！"); throw new BadRequestException("请输入或者扫描冷却区满轴位的点位！");

6
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
View File

@@ -19,6 +19,7 @@
输入.product_area TYPEAS s_string 输入.product_area TYPEAS s_string
输入.point_type TYPEAS s_string 输入.point_type TYPEAS s_string
输入.cant_location TYPEAS f_string 输入.cant_location TYPEAS f_string
输入.mater_flag TYPEAS s_string
[临时表] [临时表]
@@ -106,6 +107,9 @@
ENDOPTION ENDOPTION
OPTION 输入.point_type = "5" OPTION 输入.point_type = "5"
IFNULL(po.material_code,'') = '' IFNULL(po.material_code,'') = ''
ENDOPTION
OPTION 输入.mater_flag = "1"
IFNULL(po.material_code,'') = ''
ENDOPTION ENDOPTION
UNION UNION
SELECT SELECT
@@ -161,7 +165,7 @@
FROM FROM
sch_base_task sch_base_task
WHERE WHERE
( point_code1 = empty_point_code OR point_code2 = empty_point_code ) ( point_code1 = empty_point_code OR point_code2 = empty_point_code OR point_code4 = empty_point_code )
AND task_status < '07' AND task_status < '07'
AND is_delete = '0' AND is_delete = '0'
) )