root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:手持新增查询RGV状态

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-06-27 18:33:58 +08:00
parent a8247e6d16
commit 018b0b7702
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java
View File

@@ -33,5 +33,5 @@ public interface PdaTaskService {
*/
JSONObject confirm(JSONObject whereJson);
JSONArray rgvStatusQuery(JSONObject whereJson);
JSONObject rgvStatusQuery(JSONObject whereJson);
}

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java
View File

@@ -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;
}
}

11
lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql
View File

@@ -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

10
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java
View File

@@ -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<String,String> 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<String, String> 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");
}
}