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

rev:套轴申请不需要任务号

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2024-01-27 16:29:16 +08:00
parent db57ef0d0f
commit 7cfe04a977
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -974,6 +974,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("sendGetGoalStruct请求参数为--------------------------：" + whereJson.toString()); log.info("sendGetGoalStruct请求参数为--------------------------：" + whereJson.toString());
//type:2、反馈尺寸；3、申请放货；4、申请取货；6、套轴申请；7、套轴完成；8、拔轴完成；9、反馈重量 //type:2、反馈尺寸；3、申请放货；4、申请取货；6、套轴申请；7、套轴完成；8、拔轴完成；9、反馈重量
String type = whereJson.getString("type"); String type = whereJson.getString("type");
String device_code = whereJson.getString("device_code");
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
//桁架任务 //桁架任务
@@ -981,11 +982,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//纸管任务 //纸管任务
String task_code2 = whereJson.getString("task_code2"); String task_code2 = whereJson.getString("task_code2");
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code1 + "'").uniqueResult(0); JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code1 + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(task_jo)) { if (ObjectUtil.isEmpty(task_jo) && !type.equals("6")) {
throw new BadRequestException("接口sendGetGoalStruct，任务号为空！"); throw new BadRequestException("接口sendGetGoalStruct，任务号为空！");
} }
JSONObject task_jo2 = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code2 + "'").uniqueResult(0); JSONObject task_jo2 = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code2 + "'").uniqueResult(0);
String product_area = task_jo.getString("product_area"); String product_area = "";
if (type.equals("6")) {
JSONObject device_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_code = '" + device_code + "'").uniqueResult(0);
product_area = device_jo.getString("product_area");
} else {
product_area = task_jo.getString("product_area");
}
String public_area = ""; String public_area = "";
if (product_area.equals("A1") || product_area.equals("A2")) { if (product_area.equals("A1") || product_area.equals("A2")) {
public_area = "A1"; public_area = "A1";
@@ -1389,8 +1397,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
} }
} else { } else {
//判断当前套管工位上是否存在可用的纸管或任务 //判断当前套管工位上是否存在可用的纸管或任务
JSONObject tggw_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '4' AND product_area = '" + product_area + "'").uniqueResult(0); // JSONObject tggw_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '4' AND product_area = '" + product_area + "'").uniqueResult(0);
JSONObject tggw_task = WQLObject.getWQLObject("sch_base_task").query("point_code1 = '"+tggw_jo.getString("point_code")+"' AND task_type = '010607' AND is_delete = '0' ADN task_status < '07'").uniqueResult(0); // JSONObject tggw_task = WQLObject.getWQLObject("sch_base_task").query("point_code1 = '"+tggw_jo.getString("point_code")+"' AND task_type = '010607' AND is_delete = '0' ADN task_status < '07'").uniqueResult(0);
//判断在等待任务数量范围内是否存在符合的纸管，如果存在则等待，不存在则创建空载具入库任务 //判断在等待任务数量范围内是否存在符合的纸管，如果存在则等待，不存在则创建空载具入库任务
boolean need_wait = this.judgeWait(product_area, vehicle_jo); boolean need_wait = this.judgeWait(product_area, vehicle_jo);
if (!need_wait) { if (!need_wait) {