diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/controller/OtherPdaController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/controller/OtherPdaController.java index b67c04413..e92136d67 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/controller/OtherPdaController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/controller/OtherPdaController.java @@ -40,4 +40,14 @@ public class OtherPdaController { public ResponseEntity callAgvToSampling(@RequestBody JSONObject param) { return new ResponseEntity<>(otherPdaService.callAgvToSampling(param), HttpStatus.OK); } + @PostMapping("/onlyCallRollTruss") + @Log("呼叫出辊-桁架任务完成不做AGV") + public ResponseEntity onlyCallRollTruss(@RequestBody JSONObject param) { + return new ResponseEntity<>(otherPdaService.onlyCallRollTruss(param), HttpStatus.OK); + } + @PostMapping("/onlySendRollTruss") + @Log("呼叫入辊-桁架任务完成不做AGV") + public ResponseEntity onlySendRollTruss(@RequestBody JSONObject param) { + return new ResponseEntity<>(otherPdaService.onlySendRollTruss(param), HttpStatus.OK); + } } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/OtherPdaService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/OtherPdaService.java index ea016dd6f..3bf3b7c18 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/OtherPdaService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/OtherPdaService.java @@ -28,4 +28,18 @@ public interface OtherPdaService { * @return / */ JSONObject callAgvToSampling(JSONObject param); + + /** + * 呼叫出辊-桁架任务完成不做AGV + * @param param / + * @return / + */ + JSONObject onlyCallRollTruss(JSONObject param); + + /** + * 呼叫入辊 + * @param param / + * @return / + */ + JSONObject onlySendRollTruss(JSONObject param); } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/GxPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/GxPdaServiceImpl.java index b23eff301..b872d1f0b 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/GxPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/GxPdaServiceImpl.java @@ -181,7 +181,7 @@ public class GxPdaServiceImpl implements GxPdaService { pointService.updateBatchById(updatePoints); JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); - result.put("message", "管芯出库全部请求成功!"); + result.put("message", "管芯出库 " + number + " 个管芯!"); return result; } } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java index fd0496722..de35363b4 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java @@ -13,6 +13,8 @@ import org.nl.wms.sch.task_manage.TaskStatus; import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition; import org.nl.wms.sch.task_manage.tasks.other.CallToSamplingAGVTask; import org.nl.wms.sch.task_manage.tasks.other.WasteFoilAGVTask; +import org.nl.wms.sch.task_manage.tasks.raw.RawCallRollTrussTask; +import org.nl.wms.sch.task_manage.tasks.slitter.SlitterSendRollTrussTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -34,6 +36,10 @@ public class OtherPdaServiceImpl implements OtherPdaService { private ISchBaseTaskService taskService; @Autowired private CallToSamplingAGVTask callToSamplingAGVTask; + @Autowired + private RawCallRollTrussTask rawCallRollTrussTask; + @Autowired + private SlitterSendRollTrussTask slitterSendRollTrussTask; @Override @Transactional(rollbackFor = Exception.class) public JSONObject startMoveWasteFoil(JSONObject param) { @@ -52,6 +58,7 @@ public class OtherPdaServiceImpl implements OtherPdaService { param.put("config_code", "WasteFoilAGVTask"); param.put("stage", "first"); param.put("total", row.size()); + param.put("create_mode", GeneralDefinition.PDA_CREATION); wasteFoilAGVTask.apply(param); JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); @@ -95,6 +102,7 @@ public class OtherPdaServiceImpl implements OtherPdaService { param.put("row", row); param.put("total", row.size()); param.put("up_task_code", task.getTask_code()); + param.put("create_mode", GeneralDefinition.PDA_CREATION); wasteFoilAGVTask.apply(param); // todo: 通知ACS完成上一个任务 JSONObject result = new JSONObject(); @@ -121,4 +129,50 @@ public class OtherPdaServiceImpl implements OtherPdaService { result.put("message", "取样检测任务请求成功!"); return result; } + + @Override + @Transactional(rollbackFor = Exception.class) + public JSONObject onlyCallRollTruss(JSONObject param) { + log.info("手持收卷辊呼叫,只做桁架,没有AGV - {}", param); + // point_code, vehicle_type + String pointCode = param.getString("point_code"); + List schBaseTasks = taskService.checkHaveTask(pointCode); + if (schBaseTasks.size() > 0) { + throw new BadRequestException("点位[" + pointCode + "]已经存在任务!"); + } + JSONObject taskParam = new JSONObject(); + taskParam.put("device_code", pointCode); + taskParam.put("vehicle_type", param.getString("vehicle_type")); + taskParam.put("is_flag", "2"); + taskParam.put("config_code", "RawCallRollTrussTask"); + taskParam.put("create_mode", GeneralDefinition.PDA_CREATION); + rawCallRollTrussTask.apply(taskParam); + JSONObject result = new JSONObject(); + result.put("status", HttpStatus.OK.value()); + result.put("message", "收卷辊呼叫任务请求成功!"); + return result; + } + + @Override + public JSONObject onlySendRollTruss(JSONObject param) { + log.info("人工把收卷辊当到对接位后执行手持入收卷辊 - {}", param); + // point_code, vehicle_code, vehicle_type + // 到物料表中查找载具号 + String pointCode = param.getString("point_code"); + List schBaseTasks = taskService.checkHaveTask(pointCode); + if (schBaseTasks.size() > 0) { + throw new BadRequestException("点位[" + pointCode + "]已经存在任务!"); + } + JSONObject taskParam = new JSONObject(); + taskParam.put("device_code", pointCode); + taskParam.put("vehicle_code", param.getString("vehicle_code")); + taskParam.put("vehicle_type", param.getString("vehicle_type")); + taskParam.put("config_code", "SlitterSendRollTrussTask"); + taskParam.put("create_mode", GeneralDefinition.PDA_CREATION); + slitterSendRollTrussTask.apply(taskParam); + JSONObject result = new JSONObject(); + result.put("status", HttpStatus.OK.value()); + result.put("message", "收卷辊入库任务请求成功!"); + return result; + } } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml index 82600db2c..d51304d21 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml @@ -21,7 +21,7 @@ AND p.vehicle_type = #{vehicleType} AND p.is_used = TRUE AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.point_code1 = p.point_code AND t.task_status '07') - ORDER BY p.in_order_seq + ORDER BY p.in_order_seq, p.update_time