diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java index c158d8e0e..70c8ad749 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java @@ -33,5 +33,5 @@ public interface PdaTaskService { */ JSONObject confirm(JSONObject whereJson); - JSONArray rgvStatusQuery(JSONObject whereJson); + JSONObject rgvStatusQuery(JSONObject whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java index 46bbf39e5..7b41fd70d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java @@ -89,9 +89,9 @@ public class PdaTaskServiceImpl implements PdaTaskService { } @Override - public JSONArray rgvStatusQuery(JSONObject whereJson) { + public JSONObject rgvStatusQuery(JSONObject whereJson) { JSONArray rows = WQL.getWO("PDA_TASK").addParam("flag", "2").process().getResultJSONArray(0); JSONObject jo = wmsToAcsService.getHotPointStatus(rows); - return jo.getJSONArray("data"); + return jo; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql index 197845951..a2c416562 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql @@ -88,11 +88,12 @@ IF 输入.flag = "2" QUERY SELECT - point_code AS device_code - FROM - sch_point_code - WHERE - point_code like 'RGV%' + point_code AS device_code, + product_area + FROM + sch_base_point + WHERE + point_code like 'RGV%' ENDSELECT ENDQUERY ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java index 036b93f27..65e2437a9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java @@ -189,6 +189,8 @@ public class InHotTask extends AbstractAcsTask { log.info("mybatis执行update语句!"); HotMapper hotMapper = SpringContextHolder.getBean(HotMapper.class); hotMapper.updateHotByObject(jsonHotIvt); + JSONObject update_ivt = hotIvtTab.query("point_code = '" + jsonTask.getString("point_code3") + "'").uniqueResult(0); + log.info("更新完后烘箱库存为:-----------------" + update_ivt.toString()); hot_point_code = jsonHotIvt.getString("ext_code"); } @@ -212,10 +214,10 @@ public class InHotTask extends AbstractAcsTask { } //将该母卷的入烘箱标识改为0 - HashMap map = new HashMap<>(); - map.put("is_baking","0"); - WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").update(map,"container_name = '"+jsonHotMst.getString("container_name")+"'"); - log.info("母卷:"+jsonHotMst.getString("container_name")+"对应的入烘箱任务完成,请求烘烤标识改为0"); + HashMap map = new HashMap<>(); + map.put("is_baking", "0"); + WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").update(map, "container_name = '" + jsonHotMst.getString("container_name") + "'"); + log.info("母卷:" + jsonHotMst.getString("container_name") + "对应的入烘箱任务完成,请求烘烤标识改为0"); } }