diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index ce7ba16..ac3cd79 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun; +import org.nl.acs.common.StandardOrdinarySiteDevice; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; @@ -115,17 +116,18 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic String emptyNum = null; String device_code = null; - if (phase == 0x67) { - //故障信息 - if (arr[18] * 256 + arr[19] == 0) { - - } - FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); - request.setDevice_code(this.device_code); - request.setState("故障"); - acsToWmsService.notify(request); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0); - } +// if (phase == 0x67) { +// //故障信息 +// if (arr[18] * 256 + arr[19] == 0) { +// +// } +// FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); +// request.setDevice_code(this.device_code); +// request.setType("3"); +// request.setState("故障"); +// acsToWmsService.notify(request); +// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0); +// } TaskDto task = new TaskDto(); if(ObjectUtil.isNotEmpty(inst)){ @@ -187,6 +189,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //取货完毕 //(需要WCS反馈) } else if (phase == 0x05) { + if (agvaddr == 0) { agvaddr = agvaddr_copy; } @@ -207,8 +210,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic device_code = old_device_code; } } + device_code = deviceService.queryDeviceCodeByAddress(agvaddr); device = deviceAppService.findDeviceByCode(device_code); - + if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { + log.info("起点设备名称是{}",device_code); +// acsToWmsService.ghsmlqhfinish(task); + } if (ObjectUtil.isEmpty(device_code)) { log.info(agvaddr + "对应设备号为空!"); logServer.deviceExecuteLog(this.device_code, "", "", "对应设备号为空" + device_code); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java index ff033e3..8787685 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java @@ -164,10 +164,11 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD acsToWmsService.notify(request); } } - if (error != last_error &&error!=0) { + if (error != last_error ) { FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); request.setDevice_code(this.device_code); - request.setState("故障"); + request.setType("3"); + request.setState(String.valueOf(error)); acsToWmsService.notify(request); } } catch (Exception var17) { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index afa76bb..ce09175 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -4,6 +4,7 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.acs.ext.wms.data.*; +import org.nl.acs.task.service.dto.TaskDto; public interface AcsToWmsService { @@ -135,4 +136,9 @@ public interface AcsToWmsService { * 任务阶段反馈最新点位 */ String feedbackState(BaseRequest request); + + /** + * 根据指令号找到任务号后将start_point_code为固化室出口的任务id反馈给lms + */ + public String ghsmlqhfinish(TaskDto task); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index a2db2d3..11cd458 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -607,4 +607,31 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { MDC.remove(log_file_type); } } + + @Override + public String ghsmlqhfinish(TaskDto task) { + String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); + JSONObject jo = new JSONObject(); + jo.put("task_id", task.getExt_task_id()); + String result2 = null; + + AddressDto addressDto = addressService.findByCode("ghsmlqhfinish"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + log.info("ghsmlqhfinish----请求参数{}", jo); + + try { + result2 = HttpRequest.post(url) + .body(String.valueOf(jo)) + .execute().body(); + //System.out.println(result2); + log.info("ghsmlqhfinish----返回参数{}", result2); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + //System.out.println(msg); + + } + return result2; + } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 7da4931..05e273e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -312,6 +312,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme wrapper.lt(Task::getTask_status,2); } } + wrapper.orderByDesc(Task::getCreate_time); IPage taskPage = taskMapper.selectPage(queryPage,wrapper); final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(taskPage, TaskDto.class)); return json; @@ -419,6 +420,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme if (!StrUtil.isEmpty(create_time) && !StrUtil.isEmpty(end_time)) { wrapper.between(Task::getCreate_time,create_time,end_time); } + wrapper.orderByDesc(Task::getCreate_time); IPage taskPage = taskMapper.selectPage(queryPage,wrapper); final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(taskPage, TaskDto.class)); JSONArray array = json.getJSONArray("content"); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java index cae765a..de41e07 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java @@ -253,6 +253,7 @@ public class HandServiceImpl implements HandService { inst.put("priority",list.get(i).getPriority()); inst.put("create_time",list.get(i).getCreate_time()); inst.put("carno",list.get(i).getCarno()==null?"":list.get(i).getCarno()); + inst.put("send_status",list.get(i).getSend_status()); data.add(inst); } JSONObject resultJson = new JSONObject(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java index 795343d..5f7b715 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java @@ -71,21 +71,33 @@ public class SyncDeviceStatus { for (Device device : deviceList) { if (device.getDeviceDriver() instanceof BaoshijianSiteDeviceDriver) { BaoshijianSiteDeviceDriver baoshijianSiteDeviceDriver=(BaoshijianSiteDeviceDriver)device.getDeviceDriver(); + JSONObject json2 = new JSONObject(); + json2.put("device_code", baoshijianSiteDeviceDriver.getDeviceCode()); + json2.put("mode",baoshijianSiteDeviceDriver.getX0()); + baoshijian.add(json2); JSONObject json = new JSONObject(); json.put("device_code", baoshijianSiteDeviceDriver.getDeviceCode()+"DJW01"); json.put("move",baoshijianSiteDeviceDriver.getX1()); + json.put("mode",baoshijianSiteDeviceDriver.getX0()); baoshijian.add(json); - json.put("device_code", baoshijianSiteDeviceDriver.getDeviceCode()+"DJW02"); - json.put("move",baoshijianSiteDeviceDriver.getX2()==1?0:1); - baoshijian.add(json); + JSONObject json1 = new JSONObject(); + json1.put("device_code", baoshijianSiteDeviceDriver.getDeviceCode()+"DJW02"); + json1.put("move",baoshijianSiteDeviceDriver.getX2()==1?0:1); + json.put("mode",baoshijianSiteDeviceDriver.getX0()); + baoshijian.add(json1); } else if (device.getDeviceDriver() instanceof GuhuashiSiteDeviceDriver) { GuhuashiSiteDeviceDriver guhuashiSiteDeviceDriver=(GuhuashiSiteDeviceDriver)device.getDeviceDriver(); JSONObject json = new JSONObject(); json.put("device_code", guhuashiSiteDeviceDriver.getDeviceCode()); + //温度设定 json.put("temperature_setting", guhuashiSiteDeviceDriver.getVW7010()); + //温度显示 json.put("temperature", guhuashiSiteDeviceDriver.getVW7012()); + //湿度设定 json.put("humidity_setting", guhuashiSiteDeviceDriver.getVW7014()); + //湿度显示 json.put("humidity", guhuashiSiteDeviceDriver.getVW7016()); + //阶段累加时间 json.put("total_running_time", guhuashiSiteDeviceDriver.getVW7038()); json.put("current_stage", guhuashiSiteDeviceDriver.getVW7042()); json.put("executing_stage_num", guhuashiSiteDeviceDriver.getVW7044()); @@ -93,6 +105,8 @@ public class SyncDeviceStatus { json.put("front_door", guhuashiSiteDeviceDriver.getVW70004()==0?1:0); json.put("back_door", guhuashiSiteDeviceDriver.getVW7010()); json.put("error", guhuashiSiteDeviceDriver.getVD7046()); + //正在执行的阶段数 0-固化；1-干燥； + json.put("current_stage",guhuashiSiteDeviceDriver.getVW7036()); guhuashi.add(json); } else if (device.getDeviceDriver() instanceof SiteStatusDeviceDriver) { SiteStatusDeviceDriver siteStatusDeviceDriver=(SiteStatusDeviceDriver)device.getDeviceDriver(); diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 76414a1..ec47ee2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -44,7 +44,7 @@ https://juejin.cn/post/6844903775631572999 15 - 50MB + 100MB 20GB diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml index 031b3b6..6afbb70 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml @@ -3,17 +3,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java index 103312f..07578c8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java @@ -60,6 +60,14 @@ public class AcsToWmsController { return new ResponseEntity<>(acsToWmsService.againApply(task), HttpStatus.OK); } + @PostMapping("/ghsmlqhfinish") + @Log("固化室出口取货完成") + @ApiOperation("固化室出口取货完成") + @SaIgnore + public ResponseEntity ghsmlqhfinish(@RequestBody JSONObject task) { + return new ResponseEntity<>(acsToWmsService.ghsmlqhfinish(task), HttpStatus.OK); + } + @PostMapping("/feedbackState") @Log("ACS系统反馈AGV取放货状态") @ApiOperation("ACS系统反馈AGV取放货状态") diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index 720cb38..61fb943 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -28,4 +28,11 @@ public interface AcsToWmsService { * @return */ AgainApplyResponse againApply(JSONObject task); + + /** + * 固化室出口取货完成 + * @param task + * @return + */ + AgainApplyResponse ghsmlqhfinish(JSONObject task); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 7cda1af..84f6d51 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -23,8 +23,10 @@ import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.AbstractTask; import org.nl.wms.sch.task_manage.GeneralDefinition; import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum; +import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum; import org.nl.wms.sch.task_manage.task.TaskFactory; import org.nl.wms.sch.task_manage.task.core.TaskStatus; +import org.nl.wms.sch.task_manage.task.tasks.auto.GHCMLTask; import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -69,7 +71,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { private ISysInteractRecordService interactRecordService; @Autowired private CockpitMapper cockpitMapper; - + @Autowired + private GHCMLTask ghcmlTask; /** * 初始化反射方法 */ @@ -211,10 +214,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { dasDeviceFault.setRegion_code(pointService.getById(device_code).getRegion_code()); dasDeviceFault.setData_id(IdUtil.getSnowflake(1, 1).nextIdStr()); dasDeviceFault.setFailure_time(now); - dasDeviceFault.setFailure_info(state+"故障"); + dasDeviceFault.setFailure_info(state); cockpitMapper.insertDeviceFault(dasDeviceFault); - schBasePoint.setIs_used(false); - pointService.update(schBasePoint); } } @@ -289,5 +290,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } return result; } + @Override + public AgainApplyResponse ghsmlqhfinish(JSONObject task) { + AgainApplyResponse result = AgainApplyResponse.responseOk(task.getString("request_no")); + SchBaseTask task2 = taskService.getById(task.getString("task_id")); + String startpoint=task2.getPoint_code1(); + SchBasePoint startPointObj = pointService.getById(startpoint); + //校验起点是固化室出口的任务 + String jwc = startpoint.substring(startpoint.length() - 1); + if(jwc.equals("C")){ + ghcmlTask.finishTask(task2, TaskFinishedTypeEnum.AUTO_ACS); + result.setMessage("该任务起点是固化室出口点位修改成功"); + }else{ + result.setMessage("该任务起点不是固化室出口"); + } + return result; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index 3433909..fe788e5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -58,21 +58,20 @@ public class SchBasePointServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper<>(); - lam.like(ObjectUtil.isNotEmpty(blurry), SchBasePoint::getPoint_code, blurry) - .or(ObjectUtil.isNotEmpty(blurry), lam1 -> lam1.like(SchBasePoint::getPoint_name, blurry)) - .eq(ObjectUtil.isNotEmpty(workshop_code), SchBasePoint::getWorkshop_code, workshop_code) + lam.eq(ObjectUtil.isNotEmpty(workshop_code), SchBasePoint::getWorkshop_code, workshop_code) + .and(ObjectUtil.isNotEmpty(blurry), la -> la.like(SchBasePoint::getPoint_code, blurry) + .or().like(SchBasePoint::getPoint_name, blurry)) .eq(ObjectUtil.isNotEmpty(region_code), SchBasePoint::getRegion_code, region_code) .eq(ObjectUtil.isNotEmpty(point_type), SchBasePoint::getPoint_type, point_type) .eq(ObjectUtil.isNotEmpty(point_status), SchBasePoint::getPoint_status, point_status) .eq(ObjectUtil.isNotEmpty(is_used), SchBasePoint::getIs_used, is_used) - .and(!lock_type, slam -> slam.isNull(SchBasePoint::getIng_task_code) - .or() + .and(!lock_type, slam -> slam.isNull(SchBasePoint::getIng_task_code).or() .eq(SchBasePoint::getIng_task_code, "")) .and(lock_type, slam -> slam.isNotNull(SchBasePoint::getIng_task_code) .ne(SchBasePoint::getIng_task_code, "")) .orderByAsc(SchBasePoint::getRegion_code) - .orderByAsc(SchBasePoint::getPoint_type) .orderByAsc(SchBasePoint::getPoint_code) + .orderByAsc(SchBasePoint::getPoint_type) .apply(parent_point, "point_code = parent_point_code"); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); pointMapper.selectPage(pages, lam); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java index 9ded2bd..5d68fdb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java @@ -130,5 +130,4 @@ public class SchBaseTask implements Serializable { private String start_wait_point; @ApiModelProperty(value = "放货等待点") private String next_wait_point; - } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java index 71ecf0f..f27b50d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java @@ -118,7 +118,7 @@ public class GHCMLTask extends AbstractTask { jsonObject.put("pcsn",ObjectUtil.isNotEmpty(groupInfo) ? groupInfo.getPcsn() : null); SchBasePoint point = findNextPoint(nextRegionStr, jsonObject); if (ObjectUtil.isEmpty(point)) { - throw new BadRequestException("涂板线[" + task.getPoint_code1() + "]未找到所需点位!"); + throw new BadRequestException("暂存区域[" + task.getPoint_code1() + "]未找到所需点位!"); } log.info("当前任务{}找到预计终点{}",task.getTask_id(),point.getPoint_code()); // 设置组盘 - 需要的话由子类自行实现 @@ -234,6 +234,7 @@ public class GHCMLTask extends AbstractTask { vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code()); vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name()); vehiclematerialgroup.setMove_way(vehiclematerialgroup.getMove_way() + " -> " + endPointObj.getPoint_code()); + vehiclematerialgroup.setGroup_bind_material_status("3"); vehiclematerialgroupService.updateById(vehiclematerialgroup); // 终点解锁 endPointObj.setIng_task_code(""); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml index 64f7e2e..2781732 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml @@ -39,7 +39,6 @@ FROM sch_base_point p LEFT JOIN sch_base_vehiclematerialgroup vg ON p.vehicle_code = vg.vehicle_code - AND vg.group_bind_material_status = '2' WHERE p.region_code = 'ZC' AND p.is_used = TRUE and p.row_num in ( @@ -47,7 +46,6 @@ FROM sch_base_point p LEFT JOIN sch_base_vehiclematerialgroup vg ON p.vehicle_code = vg.vehicle_code - AND vg.group_bind_material_status = '2' WHERE p.region_code = 'ZC' and vg.material_id=#{materialId} and RIGHT(vg.pcsn,8)=RIGHT(#{pcsn},8) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java index b6b2ab6..f3f828c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java @@ -38,6 +38,7 @@ import org.nl.wms.util.TaskUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -323,7 +324,7 @@ public class TBXMLTask extends AbstractTask { : ""); groupEntity.setMaterial_qty(ObjectUtil.isNotEmpty(qty) && qty > 0 ? qty - : ObjectUtil.isEmpty(materialObj.getStandard_qty()) ? 0 : Integer.parseInt(materialObj.getStandard_qty()) * 11); + : ObjectUtil.isEmpty(materialObj.getStandard_qty()) ? 0 : Integer.parseInt(materialObj.getStandard_qty())); groupEntity.setCreate_id(GeneralDefinition.ACS_ID); groupEntity.setCreate_name(GeneralDefinition.ACS_NAME); groupEntity.setCreate_time(DateUtil.now()); @@ -352,7 +353,11 @@ public class TBXMLTask extends AbstractTask { public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { String endPoint = taskObj.getPoint_code2(); + //起点是对接位要转成连涂或者普涂 + String startPoint=taskObj.getPoint_code1(); + String startPoint1=startPoint.substring(0,5); SchBasePoint endPointObj = pointService.getById(endPoint); + PdmBdWorkorder orderObject = workorderService.getDeviceDockingProductionTask(startPoint1); if (ObjectUtil.isNotEmpty(endPointObj)) { SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id()); TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType); @@ -362,6 +367,11 @@ public class TBXMLTask extends AbstractTask { vehiclematerialgroup.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code()); vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name()); + //在相应工单中修改实际数量 + Integer qty=vehiclematerialgroup.getMaterial_qty(); + Integer real_qty=(orderObject.getReal_qty()).intValue()+qty; + orderObject.setReal_qty(BigDecimal.valueOf(real_qty)); + workorderService.updateById(orderObject); // 设置链路id，使用任务编码 vehiclematerialgroup.setBuss_move_id(taskObj.getTask_code()); vehiclematerialgroup.setMove_way(vehiclematerialgroup.getMove_way() + " -> " + endPointObj.getPoint_code());