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

fix:反馈ACS管芯库存

Browse Source
This commit is contained in:
zhouz
2024-06-12 11:24:57 +08:00
parent c2384e73a4
commit 6c5bc123c9
7 changed files with 86 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java
View File

@@ -134,5 +134,11 @@ public class WmsToAcsController {
return new ResponseEntity<>(wmsToAcsService.getWeight(jo), HttpStatus.OK);
}
@PostMapping("/getTubeMsg")
@Log(value = "反馈管芯库存信息", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
public ResponseEntity<Object> getTubeMsg(@RequestBody JSONObject jo) {
return new ResponseEntity<>(wmsToAcsService.getTubeMsg(jo), HttpStatus.OK);
}
}

5
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java
View File

@@ -144,4 +144,9 @@ public interface WmsToAcsService {
* @return /
*/
JSONObject getWeight(JSONObject jo);
JSONObject getTubeMsg(JSONObject jo);
}

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

@@ -467,4 +467,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
return AcsUtil.notifyAcs(api, arr);
}
@Override
public JSONObject getTubeMsg(JSONObject whereJson) {
String api = "api/wms/getTubeMes";
JSONArray arr = new JSONArray();
arr.add(whereJson);
return AcsUtil.notifyAcs(api, arr);
}
}

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

@@ -1530,7 +1530,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
//取满放满
form.put("point_code1", jsonCoolIvt.getString("full_point_code"));
form.put("point_code2", device_jo.getString("up_point_code") + "_M");
form.put("task_type", "010702");
form.put("task_type", "011002");
form.put("material_code", containerName);
form.put("vehicle_code", jsonCoolIvt.getString("full_vehicle_code"));
form.put("product_area", device_jo.getString("product_area"));
@@ -1549,7 +1549,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
JSONObject jsonIvt = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().uniqueResult(0);
form.put("point_code4", jsonIvt.getString("empty_point_code"));
}
form.put("task_type", "010701");
form.put("task_type", "011001");
form.put("material_code", containerName);
form.put("vehicle_code", jsonCoolIvt.getString("full_vehicle_code"));
form.put("product_area", device_jo.getString("product_area"));
@@ -1567,7 +1567,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
form.put("point_code1", device_jo.getString("up_point_code") + "_M");
//寻找可用的冷却区满轴点位
form.put("point_code2", jsonIvt.getString("full_point_code"));
form.put("task_type", "010704");
form.put("task_type", "011004");
form.put("material_code", containerName);
form.put("vehicle_code", device_jo.getString("up_scroll"));
form.put("product_area", device_jo.getString("product_area"));