From 7043d95d28a67b789ce658b2c989bae8ffb20108 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 20 Sep 2022 10:22:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java index 13e61175..0745cafb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -619,8 +619,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { /* * 判断确认类型，并进行相对应的操作 */ - // 投料确认： 1.1 - if (StrUtil.equals(type, "1.1")) { + // 大称投料确认： 1.1；小称投料确认：1.3 + if (StrUtil.equals(type, "1.1") || StrUtil.equals(type, "1.3")) { // 更新称重记录表上报人 JSONObject jsonDtl = dtlTab.query("formuladtl_id = '" + jsonObject.getString("formuladtl_id") + "'").uniqueResult(0); jsonWeight.put("record_optid", jsonDtl.get("start_id")); @@ -652,8 +652,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { result.put("status", "400"); result.put("message", "称重成功，自动确认失败"); } - // 投料强制确认： 1.2 - } else if (StrUtil.equals(type, "1.2")) { + // 大称投料强制确认： 1.2；小称投料强制确认：1.4 + } else if (StrUtil.equals(type, "1.2") || StrUtil.equals(type, "1.4")) { // 更新称重记录表上报人 JSONObject jsonDtl = dtlTab.query("formuladtl_id = '" + jsonObject.getString("formuladtl_id") + "'").uniqueResult(0); jsonWeight.put("record_optid", jsonDtl.get("start_id"));