From f5913a31547b1ffc0e9bee54d935249e2c8dbf30 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 4 Aug 2022 16:38:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EmptyVehicleServiceImpl.java | 14 ++++++++------ .../nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/service/impl/EmptyVehicleServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/service/impl/EmptyVehicleServiceImpl.java index f78f02db..11e3fcfb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/service/impl/EmptyVehicleServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/service/impl/EmptyVehicleServiceImpl.java @@ -557,10 +557,12 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService { line_jo.put("create_time", now); line_jo.put("update_optid", currentUserId); line_jo.put("update_optname", SecurityUtils.getNickName()); - line_jo.put("workorder_id", obj.getString("workorder_id")); - line_jo.put("workordercard_id", obj.getString("workordercard_id")); - line_jo.put("worktaskno_id", obj.getString("worktask_id")); - line_jo.put("workprocedure_id", obj.getString("workprocedure_id")); + if (ObjectUtil.isNotEmpty(obj)){ + line_jo.put("workorder_id", obj.getString("workorder_id")); + line_jo.put("workordercard_id", obj.getString("workordercard_id")); + line_jo.put("worktaskno_id", obj.getString("worktask_id")); + line_jo.put("workprocedure_id", obj.getString("workprocedure_id")); + } map.put("makeup_optid", currentUserId + ""); map.put("makeup_optname", SecurityUtils.getNickName()); map.put("makeup_time", now); @@ -591,7 +593,7 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService { throw new PdaRequestException("点位不能为空！"); } - //1、调用立库入库申请 + /*//1、调用立库入库申请 HashMap map = new HashMap<>(); map.put("mode","1"); map.put("station",point_code); @@ -602,7 +604,7 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService { if (!"1".equals(result)) { throw new PdaRequestException("入库申请失败:" + ret.getString("message")); } - } + }*/ //查询产品生产下线组盘表 JSONArray rows = WQL.getWO("QPAD_EMPTY_VEHICLE").addParam("flag","4").addParam("vehicle_code",vehicle_code).process().getResultJSONArray(0); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql index e9009d4b..e706d2c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql @@ -117,7 +117,7 @@ off.material_id, mb.material_code, mb.material_name, - off.qty, + off.qty AS weight, mu.ext_id AS unit_ext_id, off.qty_unit_id, off.qty_unit_name,