From f87e58c08d7183583ce81694b63b39fffa96e8e6 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Tue, 28 Mar 2023 19:02:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E7=AE=B1=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=87=BA=E5=85=A5=E7=A9=BA=E7=AE=B1=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../position/service/dto/CachelinePositionDto.java | 2 +- .../pda/service/impl/CacheLineHandServiceImpl.java | 11 +++++------ .../src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/dto/CachelinePositionDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/dto/CachelinePositionDto.java index 78234925..494afd87 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/dto/CachelinePositionDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/dto/CachelinePositionDto.java @@ -21,7 +21,7 @@ public class CachelinePositionDto implements Serializable { private String position_name; /** 位置顺序号 */ - private BigDecimal positionOrder_no; + private BigDecimal positionorder_no; /** 缓存线编码 */ private String cacheline_code; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java index 1ab56956..a8d07dc2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java @@ -457,7 +457,6 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{ afterIvt.put("vehmaterial_id", IdUtil.getStringId()); afterIvt.put("vehicle_code", vehicle_code); afterIvt.put("cacheLine_code", cacheLine_code); - afterIvt.put("position_code", position_code); afterIvt.put("vehicle_status", "1"); afterIvt.put("update_time", DateUtil.now()); afterIvt.put("create_time", DateUtil.now()); @@ -466,12 +465,12 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{ // 出空箱 if("2".equals(inOut_type)) { // 缓存线载具物料表 - JSONObject json = vehMaterTab.query("cacheLine_code = '" + position_code + "' and vehicle_status= '1' and vehicle_code = '" + vehicle_code + "'").uniqueResult(0); + JSONObject json = vehMaterTab.query("cacheLine_code = '" + cacheLine_code + "'and vehicle_code = '" + vehicle_code + "' and vehicle_status= '1'").uniqueResult(0); if(json == null) { throw new BadRequestException("无法找到缓存线【" + cacheLine_code + "】的空箱【" + vehicle_code + "】，出空箱失败"); } // 删除掉出库的箱子及关联物料 - result = vehMaterTab.delete("cacheLine_code = '" + position_code + "' and vehicle_code = '" + vehicle_code + "'").getSucess(); + result = vehMaterTab.delete("cacheLine_code = '" + cacheLine_code + "' and vehicle_code = '" + vehicle_code + "'").getSucess(); } return Integer.toString(result); } @@ -637,7 +636,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{ @Override public String cacheLineOutBoxExceptionConfirm(JSONObject param) { String inOut_type = param.getString("inOut_type"); - String wcsdevice_code = param.getString("wcsdevice_code"); + String cacheLine_code = param.getString("wcsdevice_code"); String position_code = param.getString("position_code"); String vehicle_code = param.getString("vehicle_code"); //缓存线位置表 @@ -645,7 +644,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{ // 缓存线载具物料表 WQLObject ivtTab = WQLObject.getWQLObject("sch_cacheline_vehilematerial"); //1.确定缓存线点位 - JSONObject vehiobj = positionTab.query("position_code = " + position_code + " and cacheLine_code like '%" + wcsdevice_code + "%'").uniqueResult(0); + JSONObject vehiobj = positionTab.query("position_code = " + position_code + " and cacheLine_code like '%" + cacheLine_code + "%'").uniqueResult(0); //2.绑定新料箱条码（入满箱或者入空箱），设置缓存线点位不为空 vehiobj.put("vehicle_code", vehicle_code); vehiobj.put("is_empty", "0"); @@ -655,7 +654,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{ //4.初始化料箱 HashMap json = new HashMap<>(); json.put("vehicle_code", vehicle_code); - json.put("cacheLine_code", position_code); + json.put("cacheLine_code", cacheLine_code); json.put("vehmaterial_id", IdUtil.getStringId()); json.put("create_time", DateUtil.now()); // 入满箱扫码异常 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql index 8c83281b..087f9370 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql @@ -185,7 +185,7 @@ sch_cacheline_position.position_name, sch_cacheline_position.vehicle_code, sch_cacheline_position.layer_num, - sch_cacheline_position.positionOrder_no, + sch_cacheline_position.positionorder_no, sch_cacheline_vehilematerial.workprocedure_code, sch_cacheline_vehilematerial.workprocedure_name, sch_cacheline_vehilematerial.material_uuid,