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