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

rev:MES调用确认下卷不做处理，分切输送出任务载具号维护

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-06-02 18:02:37 +08:00
parent e7af74c17d
commit be36bf1468
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -210,7 +210,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
JSONObject jsonSb = sbTab.query("ext_code = '" + resourceName + "'").uniqueResult(0); JSONObject jsonSb = sbTab.query("ext_code = '" + resourceName + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonSb)) throw new BadRequestException("点位设备不存在"); if (ObjectUtil.isEmpty(jsonSb)) throw new BadRequestException("点位设备不存在");
if (StrUtil.equals("1", jsonSb.getString("is_used"))) { /*if (StrUtil.equals("1", jsonSb.getString("is_used"))) {
//查询该母卷对应的工单状态是否为准备就绪，如果不是则提示报错 //查询该母卷对应的工单状态是否为准备就绪，如果不是则提示报错
// 更新工单状态 // 更新工单状态
JSONObject jsonRaw = rawTab.query("container_name = '" + containerName + "'").uniqueResult(0); JSONObject jsonRaw = rawTab.query("container_name = '" + containerName + "'").uniqueResult(0);
@@ -233,7 +233,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
} }
jsonRaw.put("status", "04"); jsonRaw.put("status", "04");
rawTab.update(jsonRaw); rawTab.update(jsonRaw);
} }*/
result.put("RTYPE", "S"); result.put("RTYPE", "S");
result.put("RTMSG", "操作成功!"); result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1); result.put("RTOAL", 1);

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

@@ -214,7 +214,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
throw new BadRequestException("此物料不存在" + json.getString("MATNR")); throw new BadRequestException("此物料不存在" + json.getString("MATNR"));
} }
JSONObject sub_jo = WQLObject.getWQLObject("PDM_BI_SubPackageRelation").query("container_name = '" + sap_pcsn + "'").uniqueResult(0); JSONObject sub_jo = WQLObject.getWQLObject("PDM_BI_SubPackageRelation").query("sap_pcsn = '" + sap_pcsn + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(sub_jo)) { if (ObjectUtil.isEmpty(sub_jo)) {
//为空新增一条 //为空新增一条
sub_jo = new JSONObject(); sub_jo = new JSONObject();
@@ -229,6 +229,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
sub_jo.put("container_name", sap_pcsn); sub_jo.put("container_name", sap_pcsn);
sub_jo.put("width", width); sub_jo.put("width", width);
sub_jo.put("net_weight", json.getString("LFIMG")); sub_jo.put("net_weight", json.getString("LFIMG"));
sub_jo.put("box_weight", json.getString("LFIMG"));
sub_jo.put("length", length); sub_jo.put("length", length);
sub_jo.put("is_un_plan_production", 0); sub_jo.put("is_un_plan_production", 0);
sub_jo.put("create_id", 0); sub_jo.put("create_id", 0);
@@ -238,16 +239,23 @@ public class SapToLmsServiceImpl implements SapToLmsService {
sub_jo.put("sap_pcsn", sap_pcsn); sub_jo.put("sap_pcsn", sap_pcsn);
sub_jo.put("vbeln", json.getString("VBELN")); sub_jo.put("vbeln", json.getString("VBELN"));
sub_jo.put("posnr", json.getString("POSNR")); sub_jo.put("posnr", json.getString("POSNR"));
sub_jo.put("box_length", json.getString("ZMXL"));
sub_jo.put("box_width", json.getString("ZMXW"));
sub_jo.put("box_high", json.getString("ZMXH"));
WQLObject.getWQLObject("PDM_BI_SubPackageRelation").insert(sub_jo); WQLObject.getWQLObject("PDM_BI_SubPackageRelation").insert(sub_jo);
} else { } else {
//不为空修改子卷包装关系 //不为空修改子卷包装关系
sub_jo.put("vbeln", json.getString("VBELN")); sub_jo.put("vbeln", json.getString("VBELN"));
sub_jo.put("posnr", json.getString("POSNR")); sub_jo.put("posnr", json.getString("POSNR"));
sub_jo.put("quanlity_in_box", 1);
sub_jo.put("package_box_sn", package_box_sn); sub_jo.put("package_box_sn", package_box_sn);
sub_jo.put("width", width); sub_jo.put("width", width);
sub_jo.put("length", length); sub_jo.put("length", length);
sub_jo.put("status", "0"); sub_jo.put("status", "0");
sub_jo.put("net_weight", json.getString("LFIMG")); // 变更为真实退货数量 sub_jo.put("net_weight", json.getString("LFIMG")); // 变更为真实退货数量
sub_jo.put("box_length", json.getString("ZMXL"));
sub_jo.put("box_width", json.getString("ZMXW"));
sub_jo.put("box_high", json.getString("ZMXH"));
WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(sub_jo); WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(sub_jo);
} }

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

@@ -129,6 +129,7 @@ public class InServiceImpl implements InService {
JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + convey_jo.getString("product_area") + "' AND point_type = '7'").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("point_code2", ss_jo.getString("point_code"));
form.put("task_type", "010401"); form.put("task_type", "010401");
form.put("vehicle_code2", ss_jo.getString("vehicle_code"));
CutConveyorTask cutConveyorTask = new CutConveyorTask(); CutConveyorTask cutConveyorTask = new CutConveyorTask();
cutConveyorTask.createTask(form); cutConveyorTask.createTask(form);

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

@@ -43,12 +43,12 @@ public class CutConveyorTask extends AbstractAcsTask {
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
JSONObject json = arr.getJSONObject(i); JSONObject json = arr.getJSONObject(i);
String vehicle_code = ""; /*String vehicle_code = "";
if (json.getString("task_type").equals("010507")) { if (json.getString("task_type").equals("010507")) {
vehicle_code = json.getString("vehicle_code"); vehicle_code = json.getString("vehicle_code");
} else { } else {
vehicle_code = json.getString("vehicle_code2"); vehicle_code = json.getString("vehicle_code2");
} }*/
AcsTaskDto dto = AcsTaskDto.builder() AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id")) .ext_task_id(json.getString("task_id"))
@@ -56,7 +56,7 @@ public class CutConveyorTask extends AbstractAcsTask {
.task_type(json.getString("acs_task_type")) .task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1")) .start_device_code(json.getString("point_code1"))
.next_device_code(json.getString("point_code2")) .next_device_code(json.getString("point_code2"))
.vehicle_code(vehicle_code) .vehicle_code(json.getString("vehicle_code2"))
.priority(json.getString("priority")) .priority(json.getString("priority"))
.remark(json.getString("remark")) .remark(json.getString("remark"))
.build(); .build();

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

@@ -253,7 +253,7 @@ public class CutTrussTask extends AbstractAcsTask {
form.put("point_code1", jsonTask.getString("point_code2")); form.put("point_code1", jsonTask.getString("point_code2"));
JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + delivery_point.getString("product_area") + "' AND point_type = '7'").uniqueResult(0); 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("point_code2", ss_jo.getString("point_code"));
form.put("vehiclie_code2", delivery_point.getString("vehicle_code")); form.put("vehicle_code2", delivery_point.getString("vehicle_code"));
form.put("task_type", "010401"); form.put("task_type", "010401");
cutConveyorTask.createTask(form); cutConveyorTask.createTask(form);
} }