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

fix: 拔轴机有轴也不一定能用，判断是否存在搬走的任务

Browse Source
This commit is contained in:
liyongde
2025-05-03 14:56:22 +08:00
parent 80d078e011
commit e6331956be
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendOutShaft.java
View File

@@ -46,7 +46,7 @@ public class AutoSendOutShaft {
queryRgvParam.put("product_area", rgv_jo.getString("product_area")); queryRgvParam.put("product_area", rgv_jo.getString("product_area"));
JSONObject canUseRgv = wmsToAcsService.queryRGVStatus(queryRgvParam); JSONObject canUseRgv = wmsToAcsService.queryRGVStatus(queryRgvParam);
String rgvResStatus = canUseRgv.getString("status"); String rgvResStatus = canUseRgv.getString("status");
boolean canUse = true; boolean canUse = false;
if (rgvResStatus.equals("200")) { if (rgvResStatus.equals("200")) {
int qty = canUseRgv.getInteger("qty"); int qty = canUseRgv.getInteger("qty");
IschBaseTaskService taskService = SpringContextHolder.getBean(IschBaseTaskService.class); IschBaseTaskService taskService = SpringContextHolder.getBean(IschBaseTaskService.class);

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

@@ -127,11 +127,22 @@ public class PaperTubeTask extends AbstractAcsTask {
JSONObject rgv_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '5' AND product_area = '" + product_area + "'").uniqueResult(0); JSONObject rgv_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '5' AND product_area = '" + product_area + "'").uniqueResult(0);
//判断是否存在未完成的成品下卷任务 //判断是否存在未完成的成品下卷任务
JSONObject container_jo = WQLObject.getWQLObject("sch_base_task").query("task_type = '010605' AND product_area = '"+product_area+"' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); JSONObject container_jo = WQLObject.getWQLObject("sch_base_task").query("task_type = '010605' AND product_area = '"+product_area+"' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
boolean needCallShaft = false;
if ("1".equals(have_qzz)) {
// 有轴也不一定能用，判断是否存在搬走的任务
JSONObject haveTask = WQLObject.getWQLObject("sch_base_task")
.query("point_code1 = '" + cbz_jo.getString("point_code")
+ "' AND product_area = '"+product_area+"' AND task_status < '07' AND is_delete = '0'")
.uniqueResult(0);
if (ObjectUtil.isNotEmpty(haveTask)) {
needCallShaft = true;
}
}
if (("0".equals(have_qzz) && "0".equals(rgv_jo.getString("have_qzz")) && ObjectUtil.isEmpty(container_jo)) if (("0".equals(have_qzz) && "0".equals(rgv_jo.getString("have_qzz")) && ObjectUtil.isEmpty(container_jo))
|| (ObjectUtil.isNotEmpty(container_jo) && ( || (ObjectUtil.isNotEmpty(container_jo) && (
container_jo.getString("point_code2").contains("RG_RGV") container_jo.getString("point_code2").contains("RG_RGV")
|| container_jo.getString("point_code2").contains("CPZC")))) { || container_jo.getString("point_code2").contains("CPZC")))
|| needCallShaft) {
PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class); PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class);
// 创建桁架任务搬运一个符合的气涨轴 // 创建桁架任务搬运一个符合的气涨轴
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();