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

代码更新

Browse Source
This commit is contained in:
ludj
2023-01-31 19:56:49 +08:00
parent b750f18f02
commit c73e27a3c6
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WP.java
View File

@@ -258,7 +258,7 @@ public class WP implements Serializable,Cloneable{
if(null!=o){
this.IN.put("输入对象."+name, value);
}else{
log.error("IO输入参数没有找到对应的属性对象：IO no Param "+name);
log.warn("IO输入参数没有找到对应的属性对象：IO no Param "+name);
}
}
}

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

@@ -13,7 +13,7 @@ public interface OutService {
JSONObject queryMaterialInfo(JSONObject whereJson);
/**
* 出站确认
* 子卷出站确认
* @param whereJson /
* @return JSONObject
*/

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

@@ -123,6 +123,7 @@ public class OutServiceImpl implements OutService {
jo.put("point_code2", empty_vehicle.getString("point_code"));
jo.put("vehicle_code", cut_qzzno);
jo.put("product_area", cut_ivt.getString("product_area"));
//分切>输送线 子卷出站
jo.put("task_type", "010404");
cutTrussTask.createTask(jo);
@@ -130,15 +131,15 @@ public class OutServiceImpl implements OutService {
String ext_code = cut_ivt.getString("ext_code");
//查询该机台编号已经配送完成，套轴完成但是未完成的分切计划
JSONObject delivery_point = WQL.getWO("PDA_02").addParam("ext_code",ext_code).addParam("flag","16").process().uniqueResult(0);
JSONObject delivery_point = WQL.getWO("PDA_02").addParam("ext_code", ext_code).addParam("flag", "16").process().uniqueResult(0);
if (ObjectUtil.isEmpty(delivery_point)) {
throw new BadRequestException("输送线不存在该分切机已经配送完成的气涨轴！");
throw new BadRequestException("分切机【" + ext_code + "】无配送完成的气涨轴!");
}
char dtl_type = delivery_point.getString("point_code").charAt(delivery_point.getString("point_code").length() - 1);
JSONObject jo = new JSONObject();
jo.put("point_code1",delivery_point.getString("point_code"));
jo.put("point_code1", delivery_point.getString("point_code"));
jo.put("point_code2", point_code);
jo.put("point_code3", point_code);
jo.put("point_code4", delivery_point.getString("point_code"));
@@ -185,8 +186,8 @@ public class OutServiceImpl implements OutService {
//如果查询到给ACS下发一个输送线任务
JSONObject form = new JSONObject();
form.put("point_code1", point_code);
JSONObject convey_jo = WQLObject.getWQLObject("").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("").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();

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

@@ -282,6 +282,7 @@ public class ShippingServiceImpl implements ShippingService {
@Override
public JSONObject acrossVehicle(JSONObject whereJson) {
//载具横移起点
String point_code = whereJson.getString("point_code");
if (StrUtil.isEmpty(point_code)) {
@@ -294,7 +295,7 @@ public class ShippingServiceImpl implements ShippingService {
}
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("(point_code1 = '" + point_code + "' OR point_code2 = '" + point_code + "') AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task_jo)) {
throw new BadRequestException("该点位存在未完成的任务，请先完成任务！");
throw new BadRequestException("点位" + point_code + "存在未完成的任务，请先完成任务！");
}
String point_status = del_jo.getString("point_status");
@@ -341,7 +342,7 @@ public class ShippingServiceImpl implements ShippingService {
}
JSONObject plan = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("qzzno = '" + qzzno + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(plan)) {
throw new BadRequestException("未查询到该气涨轴对应的分切计划！");
throw new BadRequestException("未找到气涨轴【" + qzzno + "】对应的分切计划!");
}
String resource_name = plan.getString("resource_name");
JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '" + resource_name + "'").uniqueResult(0);
@@ -351,7 +352,7 @@ public class ShippingServiceImpl implements ShippingService {
JSONObject vehicle_area = WQLObject.getWQLObject("md_pb_vehiclearea").query("product_area = '" + product_area + "' AND point_location = '" + point_location + "' AND vehicle_code = '" + vehicle_code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(vehicle_area)) {
throw new BadRequestException("该气涨轴无法放在该载具上！");
throw new BadRequestException("载具号【" + vehicle_code + "】无法放到区域【" + product_area + "】的位置【" + point_location + "】上!");
}
//判断当前输送线上是否超过最大负荷任务数量组3组

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

@@ -208,6 +208,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
//如果桁架任务执行完，右侧的输送线上存在气涨轴，则生成一个输送出的任务
log.debug("如果桁架任务执行完，右侧的输送线上存在气涨轴，则生成一个输送出的任务");
char dtl_type = jsonTask.getString("point_code1").charAt(jsonTask.getString("point_code1").length() - 1);
if (Integer.valueOf(String.valueOf(dtl_type)) % 2 != 0) {
String point_location = delivery_point.getString("point_location");
@@ -221,11 +222,13 @@ public class CutTrussTask extends AbstractAcsTask {
.addParam("find_type", "3")
.addParam("flag", "17").process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(right_point)){
log.debug("生成一个输送线出库任务");
//生成一个输送线出库任务
JSONObject form = new JSONObject();
form.put("point_code1", jsonTask.getString("point_code1"));
JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + delivery_point.getString("product_area") + "' AND point_type = '7'").uniqueResult(0);
form.put("point_code2", ss_jo.getString("point_code"));
//分切输送出
form.put("task_type", "010401");
cutConveyorTask.createTask(form);
}
@@ -299,6 +302,7 @@ public class CutTrussTask extends AbstractAcsTask {
json.put("acs_task_type", "6");
tab.insert(json);
//桁架标准任务
if (form.getString("task_type").equals("010403")) {
//更新入站气涨轴的分切计划状态
JSONArray plan_jo = 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 = '03'").getResultJSONArray(0);
@@ -325,6 +329,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
}
//分切>输送线 子卷出站
if (form.getString("task_type").equals("010404")) {
//更新出站气涨轴的分切计划状态
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);
@@ -338,7 +343,7 @@ public class CutTrussTask extends AbstractAcsTask {
WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row);
}
}
//分切>输送线 子卷入站
if (form.getString("task_type").equals("010405")) {
//更新入站气涨轴的分切计划状态
JSONArray plan_jo = 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 = '03'").getResultJSONArray(0);