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

工单反馈

Browse Source
This commit is contained in:
18188916393
2022-09-25 14:40:08 +08:00
parent 8457bcebfb
commit dc639b7071
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,8 +130,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
joo.put("device_code", device_code); joo.put("device_code", device_code);
String record_id = PressureUtil.record(joo); String record_id = PressureUtil.record(joo);
//回传不合格记录 //回传不合格记录
// Wms/api/produceTaskToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); // Wms/api/produceTaskToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl();
// wmsToJnService.feedBackQualityInfo(record_id); // wmsToJnService.feedBackQualityInfo(record_id);
} }
break; break;
} }
@@ -157,7 +157,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String record_id = PressureUtil.record(joo); String record_id = PressureUtil.record(joo);
//回传不合格记录 //回传不合格记录
WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl();
// wmsToJnService.feedBackQualityInfo(record_id); // wmsToJnService.feedBackQualityInfo(record_id);
} }
break; break;
case "2": case "2":
@@ -187,12 +187,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//叫空托盘 //叫空托盘
jsonObject.put("next_point_code", device_code); jsonObject.put("next_point_code", device_code);
//如果是叠盘位3 ，则去铁托盘缓存区取 //如果是叠盘位3 ，则去铁托盘缓存区取
if (StrUtil.equals(device_code,"KTPDDW3")){ if (StrUtil.equals(device_code, "KTPDDW3")) {
//1 更新缓存位 //1 更新缓存位
JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KTTHCQ.getCode()).addParam("flag", "4").process().getResultJSONArray(0); JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KTTHCQ.getCode()).addParam("flag", "4").process().getResultJSONArray(0);
PointUpdateUtil.updatePoint(pointarr); PointUpdateUtil.updatePoint(pointarr);
jsonObject.put("vehicle_type", VehicleTypeEnum.GTP.getCode() ); jsonObject.put("vehicle_type", VehicleTypeEnum.GTP.getCode());
}else{ } else {
produceInfoByCode = this.getProduceInfoByCode(device_code); produceInfoByCode = this.getProduceInfoByCode(device_code);
//假如是码垛位的上料位，则去看看有没有当前排产单生产的物料的半满托 //假如是码垛位的上料位，则去看看有没有当前排产单生产的物料的半满托
if (StrUtil.equals(device_code, "FJJXSXLW201") || if (StrUtil.equals(device_code, "FJJXSXLW201") ||
@@ -610,9 +610,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (StrUtil.isEmpty(material_code)) { if (StrUtil.isEmpty(material_code)) {
throw new BadRequestException("物料编码不能为空！"); throw new BadRequestException("物料编码不能为空！");
} }
String device_id = WQLObject.getWQLObject("pdm_base_device").query("device_code ='" + device_code + "'").uniqueResult(0).getString("device_id");
//根据设备去找设备id
String device_id = WQLObject.getWQLObject("sch_base_point").query("point_code='" + device_code + "'").uniqueResult(0).getString("device_id");
//根据物料code 去找物料id //根据物料code 去找物料id
JSONObject materiObj = WQLObject.getWQLObject("MD_ME_Material").query("material_code='" + material_code + "'").uniqueResult(0); JSONObject materiObj = WQLObject.getWQLObject("MD_ME_Material").query("material_code='" + material_code + "'").uniqueResult(0);
if (!StrUtil.equals(device_id, taskObj.getString("device_id"))) { if (!StrUtil.equals(device_id, taskObj.getString("device_id"))) {