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
2023-12-22 14:49:44 +08:00
parent 489a0a4b35
commit 511f4f34eb
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -948,7 +948,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public JSONObject sendGetGoalStruct(JSONObject whereJson) { public JSONObject sendGetGoalStruct(JSONObject whereJson) {
log.info("sendGetGoalStruct请求参数为--------------------------：" + whereJson.toString()); log.info("sendGetGoalStruct请求参数为--------------------------：" + whereJson.toString());
//type:2、反馈尺寸；3、申请取货；4、申请放货；6、套轴申请；7、套轴完成 //type:2、反馈尺寸；3、申请取货；4、申请放货；6、套轴申请；7、套轴完成；8、拔轴完成
String type = whereJson.getString("type"); String type = whereJson.getString("type");
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
@@ -977,7 +977,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jo.put("point_code2", fhd_jo.getString("point_code")); jo.put("point_code2", fhd_jo.getString("point_code"));
jo.put("product_area", product_area); jo.put("product_area", product_area);
jo.put("vehicle_code", "qzz"); jo.put("vehicle_code", "qzz");
jo.put("truss_type", "7"); jo.put("truss_type", "1");
JSONObject request_param = new JSONObject(); JSONObject request_param = new JSONObject();
request_param.put("have_size", cbz_size); request_param.put("have_size", cbz_size);
request_param.put("have_generation", cbz_generation); request_param.put("have_generation", cbz_generation);
@@ -1188,11 +1188,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//横移完成 //横移完成
if ("3".equals(type)) { if ("3".equals(type)) {
if (task_jo.getString("task_type").equals("010401")) { String product_area = task_jo.getString("product_area");
//判断对应的内包间区域是否启用
JSONObject pack_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '9' AND product_area = '"+product_area+"'").uniqueResult(0);
if (task_jo.getString("task_type").equals("010401") && pack_jo.getString("is_used").equals("1")) {
String vehicle_code = task_jo.getString("vehicle_code2"); String vehicle_code = task_jo.getString("vehicle_code2");
JSONObject vehicle_jo = WQLObject.getWQLObject("md_pb_vehiclearea").query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0); JSONObject vehicle_jo = WQLObject.getWQLObject("md_pb_vehiclearea").query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0);
String point_location = vehicle_jo.getString("point_location"); String point_location = vehicle_jo.getString("point_location");
String product_area = task_jo.getString("product_area");
JSONObject in_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + product_area + "' AND point_type = '6'").uniqueResult(0); JSONObject in_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + product_area + "' AND point_type = '6'").uniqueResult(0);
//查询呼叫时间最早的分切计划 //查询呼叫时间最早的分切计划
JSONObject plan_jo = WQL.getWO("PDA_02").addParam("flag", "23").addParam("point_location", point_location) JSONObject plan_jo = WQL.getWO("PDA_02").addParam("flag", "23").addParam("point_location", point_location)

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

@@ -258,6 +258,7 @@ public class CutTrussTask extends AbstractAcsTask {
throw new BadRequestException("点位：" + delivery_point.getString("point_code") + "载具号为空！"); throw new BadRequestException("点位：" + delivery_point.getString("point_code") + "载具号为空！");
} }
form.put("vehicle_code2", delivery_point.getString("vehicle_code")); form.put("vehicle_code2", delivery_point.getString("vehicle_code"));
form.put("vehicle_code", jsonTask.getString("vehicle_code"));
form.put("task_type", "010401"); form.put("task_type", "010401");
form.put("product_area", delivery_point.getString("product_area")); form.put("product_area", delivery_point.getString("product_area"));
cutConveyorTask.createTask(form); cutConveyorTask.createTask(form);