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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-02-22 11:33:13 +08:00
parent 867e837726
commit d1d54295ea
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java
View File

@@ -61,7 +61,7 @@ public class InServiceImpl implements InService {
throw new BadRequestException("未查询到对应的分切机！");
}
if (!StrUtil.equals(cut_row.getString("point_code"),cut_ivt.getString("point_code"))){
if (!StrUtil.equals(cut_row.getString("resource_name"), cut_ivt.getString("ext_code"))) {
throw new BadRequestException("请选择和分切计划相同的设备点位进行上空轴！");
}
@@ -125,8 +125,8 @@ public class InServiceImpl implements InService {
//如果查询到给ACS下发一个输送线任务
JSONObject form = new JSONObject();
form.put("point_code1", point_code);
JSONObject convey_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_code = '"+point_code+"'").uniqueResult(0);
JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '"+convey_jo.getString("product_area")+"' AND point_type = '7'").uniqueResult(0);
JSONObject convey_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_code = '" + point_code + "'").uniqueResult(0);
JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + convey_jo.getString("product_area") + "' AND point_type = '7'").uniqueResult(0);
form.put("point_code2", ss_jo.getString("point_code"));
form.put("task_type", "010401");
CutConveyorTask cutConveyorTask = new CutConveyorTask();

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
View File

@@ -108,7 +108,7 @@ public class OutServiceImpl implements OutService {
}
if (!StrUtil.equals(rows.getJSONObject(0).getString("resource_name"), cut_ivt.getString("ext_code"))) {
throw new BadRequestException("请选择和分切计划相同的设备点位进行上空轴！");
throw new BadRequestException("请选择和分切计划相同的设备点位进行下卷！");
}
String cut_qzzno = rows.getJSONObject(0).getString("qzzno");

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

@@ -393,7 +393,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
//分切>输送线 子卷出站
if (form.getString("task_type").equals("010404")) {
if (form.getString("task_type").equals("010404") && !json.getString("vehicle_code").equals("waste foil")) {
//更新出站气涨轴的分切计划状态
JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '05'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(plan_jo2)) {