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

fix:入冷却回传MES，加上冷却区点位编码

Browse Source
This commit is contained in:
zhouz
2025-09-03 15:46:56 +08:00
parent 89f9ee10f8
commit f6499ed20d
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -496,11 +496,12 @@ public class MesToLmsServiceImpl implements MesToLmsService {
mes_jo.put("iWarehouse", 2); mes_jo.put("iWarehouse", 2);
mes_jo.put("UserName", userName); mes_jo.put("UserName", userName);
mes_jo.put("PassWord", passWord); mes_jo.put("PassWord", passWord);
mes_jo.put("pointCode", container_jo.getString("full_point_code"));
//判断该接口是否需要回传 //判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0); JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
new LmsToMesServiceImpl().momRollSemiFGInboundComplete(param); new LmsToMesServiceImpl().momRollSemiFGInboundComplete(mes_jo);
} }
//将该母卷的入冷却标识改为0 //将该母卷的入冷却标识改为0

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

@@ -319,6 +319,7 @@ public class HandleBakingServiceImpl implements HandleBakingService {
param.put("iWarehouse", 2); param.put("iWarehouse", 2);
param.put("UserName", userName); param.put("UserName", userName);
param.put("PassWord", passWord); param.put("PassWord", passWord);
param.put("pointCode", cool_ivt.getString("full_point_code"));
//判断该接口是否需要回传 //判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0); JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0);

1
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java
View File

@@ -211,6 +211,7 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService {
param.put("iWarehouse", 2); param.put("iWarehouse", 2);
param.put("UserName", userName); param.put("UserName", userName);
param.put("PassWord", passWord); param.put("PassWord", passWord);
param.put("pointCode", form.getString("full_point_code"));
//判断该接口是否需要回传 //判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0); JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0);

1
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java
View File

@@ -154,6 +154,7 @@ public class InCoolIvtTask extends AbstractAcsTask {
param.put("iWarehouse", 2); param.put("iWarehouse", 2);
param.put("UserName", userName); param.put("UserName", userName);
param.put("PassWord", passWord); param.put("PassWord", passWord);
param.put("pointCode", point_code2);
//判断该接口是否需要回传 //判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0); JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0);

6
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -1870,15 +1870,15 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
if (ObjectUtil.isEmpty(struct_jo)) { if (ObjectUtil.isEmpty(struct_jo)) {
// 主存区类型更改成中转区类型：找一排主存区的更改中转区、把一排中转区的更改成主存区（只允许调用一次） // 主存区类型更改成中转区类型：找一排主存区的更改中转区、把一排中转区的更改成主存区（只允许调用一次）
String result = HttpUtil.get("http://127.0.0.1:8011/api/in/rawAssist/updateStructSect?layer_num=" + col_num); /*String result = HttpUtil.get("http://127.0.0.1:8011/api/in/rawAssist/updateStructSect?layer_num=" + col_num);
if (StringUtils.isEmpty(result)){ if (StringUtils.isEmpty(result)){
throw new BadRequestException("扩容异常"); throw new BadRequestException("扩容异常");
} }
JSONObject toJSON = JSONObject.parseObject(result); JSONObject toJSON = JSONObject.parseObject(result);
if (!toJSON.getString("status").equals("200")){ if (!toJSON.getString("status").equals("200")){
throw new BadRequestException(toJSON.getString("message")); throw new BadRequestException(toJSON.getString("message"));
} }*/
// SpringContextHolder.getBean(RawAssistIStorServiceImpl.class).updateStructSect(col_num); SpringContextHolder.getBean(RawAssistIStorServiceImpl.class).updateStructSect(col_num);
struct_jo = autoDisMove2(whereJson); struct_jo = autoDisMove2(whereJson);
if (ObjectUtil.isEmpty(struct_jo)){ if (ObjectUtil.isEmpty(struct_jo)){
throw new BadRequestException("扩容失败，当前没有可用的仓位用来移库，请稍后再试！"); throw new BadRequestException("扩容失败，当前没有可用的仓位用来移库，请稍后再试！");