From b4f25156c75c39d233b4d859a65474ff400853de Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 12 Jan 2024 14:36:24 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E8=B4=B4=E6=A0=87=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/acs/service/impl/AcsToWmsServiceImpl.java | 13 ++++++++++++- lms/nladmin-ui/src/views/wms/pdm/bi/index.vue | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 8a2d81bb2..bdef81078 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -677,10 +677,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (ObjectUtil.isEmpty(jsonCust)) { throw new BadRequestException("客户不存在请检查!"); } - JSONObject data = new JSONObject(); data.put("is_auto_table", jsonCust.getString("is_auto_table")); + //判断系统参数是否贴标 + String is_labeling = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_labeling").getValue(); + if (is_labeling.equals("0")){ + //更新实际重量 + HashMap map = new HashMap<>(); + map.put("real_weight",weight); + WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map, "package_box_sn = '" + vehicle_code + "'"); + data.put("is_auto_table", "0"); + result.put("data", data); + return result; + } + // 判断是否贴标 if (!StrUtil.equals(jsonCust.getString("is_auto_table"), "1")) { result.put("data", data); diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue index ede9f06ac..8d4ee60ca 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue @@ -520,6 +520,7 @@ +