diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index 8caba92a3..8dca99890 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -813,7 +813,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { param.put("DestLocation", to_area); try { - String resultMsg = HttpRequest.post(url) + /*String resultMsg = HttpRequest.post(url) .body(String.valueOf(param)) .execute().body(); result = JSONObject.parseObject(resultMsg); @@ -823,7 +823,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { String RTYPE = result.getString("RTYPE"); if ("E".equals(RTYPE)) { throw new BadRequestException(result.getString("RTMSG")); - } + }*/ } catch (Exception e) { 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 9f2e09def..ae56a8999 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 @@ -671,8 +671,16 @@ public class MesToLmsServiceImpl implements MesToLmsService { json.put("split_breadth", SplitBreadth); json.put("split_height", SplitHeight); json.put("split_weight", SplitWeight); - json.put("up_or_down", Attribute3); - json.put("left_or_right", Attribute4); + if (Attribute3.equals("U")){ + json.put("up_or_down", "1"); + }else { + json.put("up_or_down", "2"); + } + if (Attribute4.equals("U")){ + json.put("left_or_right", "1"); + }else { + json.put("left_or_right", "2"); + } json.put("qzz_size", qzz_size); if (ResourceName.startsWith("B5") || ResourceName.startsWith("B6")) { json.put("is_paper_ok", "1"); @@ -2093,7 +2101,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { dto.setQuality_guaran_period("90天"); } dto.setDate_of_FG_inbound(DateUtil.format(DateUtil.date(), "yyyy-MM-dd")); - subpackagerelationService.save(dto); +// subpackagerelationService.save(dto); // 返回成功 result.put("RTYPE", "S"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index d4b7afc16..a94f18522 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -109,9 +109,8 @@ public class CoolCutTask extends AbstractAcsTask { String point_code2 = jsonTask.getString("point_code2"); String point_code3 = jsonTask.getString("point_code3"); String point_code4 = jsonTask.getString("point_code4"); - + String product_area = jsonTask.getString("product_area"); if ("010301".equals(jsonTask.getString("task_type"))) { - String product_area = jsonTask.getString("product_area"); if ("B1".equals(product_area)) { //更新起点烘箱对接位 JSONObject dj_jo = WQLObject.getWQLObject("sch_base_point").query("point_code ='" + point_code1 + "'").uniqueResult(0); @@ -205,6 +204,23 @@ public class CoolCutTask extends AbstractAcsTask { } if ("010302".equals(jsonTask.getString("task_type"))) { + if ("B1".equals(product_area)) { + //更新起点烘箱对接位 + JSONObject dj_jo = WQLObject.getWQLObject("sch_base_point").query("point_code ='" + point_code1 + "'").uniqueResult(0); + dj_jo.put("point_status", "1"); + dj_jo.put("material_code", ""); + WQLObject.getWQLObject("sch_base_point").update(dj_jo); + //更新满轴终点的空轴对接位 + JSONObject cut_jo = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0); + cut_jo.put("empty_point_status", "02"); + cut_jo.put("empty_vehicle_code", "SJG"); + cut_jo.put("update_optid", currentUserId); + cut_jo.put("update_optname", currentUsername); + cut_jo.put("update_time", DateUtil.now()); + WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo); + } else { + + } // 更新主表状态 JSONObject coolMst = ivtTab.query("task_id = '" + task_id + "'").uniqueResult(0); coolMst.put("bill_status", "50");