diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 389095409..9b22cf67d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -496,11 +496,12 @@ public class MesToLmsServiceImpl implements MesToLmsService { mes_jo.put("iWarehouse", 2); mes_jo.put("UserName", userName); 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); if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { - new LmsToMesServiceImpl().momRollSemiFGInboundComplete(param); + new LmsToMesServiceImpl().momRollSemiFGInboundComplete(mes_jo); } //将该母卷的入冷却标识改为0 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java index f6998423d..9e942cc1b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java @@ -319,6 +319,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { param.put("iWarehouse", 2); param.put("UserName", userName); 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); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java index 914870d0f..5164d64dd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java @@ -211,6 +211,7 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { param.put("iWarehouse", 2); param.put("UserName", userName); 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); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java index 9ad251720..aa2885a6e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java @@ -154,6 +154,7 @@ public class InCoolIvtTask extends AbstractAcsTask { param.put("iWarehouse", 2); param.put("UserName", userName); param.put("PassWord", passWord); + param.put("pointCode", point_code2); //判断该接口是否需要回传 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index 8315eeda6..c84865aea 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -1870,15 +1870,15 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { 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)){ throw new BadRequestException("扩容异常"); } JSONObject toJSON = JSONObject.parseObject(result); if (!toJSON.getString("status").equals("200")){ throw new BadRequestException(toJSON.getString("message")); - } -// SpringContextHolder.getBean(RawAssistIStorServiceImpl.class).updateStructSect(col_num); + }*/ + SpringContextHolder.getBean(RawAssistIStorServiceImpl.class).updateStructSect(col_num); struct_jo = autoDisMove2(whereJson); if (ObjectUtil.isEmpty(struct_jo)){ throw new BadRequestException("扩容失败,当前没有可用的仓位用来移库,请稍后再试!");