From 320edd7cccaab8c8a83136f51d09c5cac4b99b9b Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Fri, 7 Mar 2025 16:24:13 +0800 Subject: [PATCH] =?UTF-8?q?add:=E7=83=98=E7=AE=B1=E6=9A=82=E5=AD=98?= =?UTF-8?q?=E4=BD=8D=E5=BC=80=E5=8F=91=E3=80=81=E5=BA=9F=E7=AE=94=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../run/TwoNDCSocketConnectionAutoRun.java | 5 ++- .../mps/controller/BakingPdaController.java | 6 +++ .../wms/pda/mps/service/BakingPdaService.java | 2 + .../service/impl/BakingPdaServiceImpl.java | 31 +++++++++++++ .../service/impl/SlitterPdaServiceImpl.java | 18 +++++++- .../st/service/impl/OtherPdaServiceImpl.java | 9 ++-- .../mapper/PdmBiRawfoilworkorderMapper.xml | 7 +++ .../wms/quartz/AutoSendWasteFoilAGVTask.java | 7 ++- .../controller/SchBasePointController.java | 4 +- .../point/service/ISchBasePointService.java | 2 +- .../service/impl/SchBasePointServiceImpl.java | 15 +++++-- .../task_manage/tasks/hot/InHotTrussTask.java | 43 ++++++++++++++----- .../tasks/other/SendWasteFoilAGVTask.java | 8 ++-- 13 files changed, 128 insertions(+), 29 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java index 8be1910c5..936b62281 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java @@ -294,6 +294,7 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } } if (("AD5".equals(device.getDevice_code()) || "AD7".equals(device.getDevice_code())) && airShowerDoorDeviceDriver.getClose() == 1) { + airShowerDoorDeviceDriver.writing("to_open2", "1"); airShowerDoorDeviceDriver.writing("to_close", "0"); airShowerDoorDeviceDriver.writing("to_close2", "0"); @@ -376,7 +377,9 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { airShowerDoorDeviceDriver = (AirShowerDoorDeviceDriver) device.getDeviceDriver(); try { if ("AD4".equals(device.getDevice_code()) || "AD6".equals(device.getDevice_code())) { - airShowerDoorDeviceDriver.writing("to_close", "1"); + if ("AD4".equals(device.getDevice_code())) { + airShowerDoorDeviceDriver.writing("to_close", "1"); + } airShowerDoorDeviceDriver.writing("to_open", "0"); if (airShowerDoorDeviceDriver.getClose2() == 1) { log.info("下发风淋门关门信号值为:{},读取关门信号值为:{}", airShowerDoorDeviceDriver.getToClose(), airShowerDoorDeviceDriver.getClose()); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/controller/BakingPdaController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/controller/BakingPdaController.java index 3fcd0780d..f80ff4284 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/controller/BakingPdaController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/controller/BakingPdaController.java @@ -42,4 +42,10 @@ public class BakingPdaController { public ResponseEntity doModifyRawInfos(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bakingPdaService.doModifyRawInfos(whereJson), HttpStatus.OK); } + + @PostMapping("/temporaryStorage") + @Log("烘箱暂存") + public ResponseEntity temporaryStorage(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(bakingPdaService.temporaryStorage(whereJson), HttpStatus.OK); + } } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/BakingPdaService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/BakingPdaService.java index d366a1283..478544bdd 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/BakingPdaService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/BakingPdaService.java @@ -28,4 +28,6 @@ public interface BakingPdaService { * @return / */ JSONObject doModifyRawInfos(JSONObject param); + + JSONObject temporaryStorage(JSONObject param); } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/BakingPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/BakingPdaServiceImpl.java index e57de7720..59e1bb11b 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/BakingPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/BakingPdaServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; @@ -16,6 +17,7 @@ import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; +import org.nl.wms.sch.point.service.dao.mapper.SchBasePointMapper; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition; @@ -55,6 +57,9 @@ public class BakingPdaServiceImpl implements BakingPdaService { private ISchBaseTaskService taskService; @Autowired private InHotCachingTrussTask inHotCachingTrussTask; + + @Autowired + private SchBasePointMapper pointMapper; @Override @Transactional(rollbackFor = Exception.class) public JSONObject bakingQuality(JSONObject param) { @@ -248,6 +253,32 @@ public class BakingPdaServiceImpl implements BakingPdaService { result.put("message", "操作成功！"); return result; } + + /** + * 烘箱作为缓存位，暂存位 + * @param param + * @return + */ + @Override + public JSONObject temporaryStorage(JSONObject param) { + + String pointCode = param.getString("point_code"); + String plan = param.getString("plan"); + JSONObject taskParam = new JSONObject(); + taskParam.put("device_code", pointCode); + taskParam.put("plan", plan); + taskParam.put("config_code", "InHotTrussTask"); + taskParam.put("create_mode", GeneralDefinition.PDA_CREATION); + SchBasePoint point = pointMapper.selectOne(new QueryWrapper().eq("point_code", pointCode)); + taskParam.put("order_code", point.getMaterial_code()); + //是否是烘箱暂存 + taskParam.put("is_storage", "1"); + inHotTrussTask.apply(taskParam); + JSONObject result = new JSONObject(); + result.put("message", "操作成功！"); + return result; + } + public boolean isValidInteger(String input) { String regex = "^[+-]?\\d+$"; return input.matches(regex); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java index a42a8ff42..e68fff07b 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java @@ -22,6 +22,8 @@ import org.nl.wms.pdm.ivt.bcut.service.IBstIvtCutpointivtService; import org.nl.wms.pdm.ivt.bcut.service.dao.BstIvtCutpointivt; import org.nl.wms.pdm.ivt.cut.service.IstIvtCutpointivtService; import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt; +import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService; +import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; @@ -76,6 +78,9 @@ public class SlitterPdaServiceImpl implements SlitterPdaService { @Autowired private SlitterRebakeAGVTask slitterRebakeAGVTask; + @Autowired + private IstIvtHotpointivtService hotpointivtService; + @Override public JSONObject queryOrderInfo(JSONObject param) { JSONObject result = new JSONObject(); @@ -104,9 +109,18 @@ public class SlitterPdaServiceImpl implements SlitterPdaService { if (isTask) { throw new BadRequestException("点位[" + pointCode + "、" + zcPoint + "]已经创建过任务！"); } + SchBasePoint zcPointObj = pointService.getById(zcPoint); - if (ObjectUtil.isEmpty(zcPointObj.getMaterial_code())) { - throw new BadRequestException("点位不存在该母卷或者该母卷已搬运"); + StIvtHotpointivt hotpointivt = hotpointivtService.getPointByCode(zcPoint, false); + if (ObjectUtil.isNotEmpty(zcPointObj)) { + if (ObjectUtil.isEmpty(zcPointObj.getMaterial_code())) { + throw new BadRequestException("点位不存在该母卷或者该母卷已搬运"); + } + } + if (ObjectUtil.isNotEmpty(hotpointivt)) { + if (ObjectUtil.isEmpty(hotpointivt.getContainer_name())) { + throw new BadRequestException("点位不存在该母卷或者该母卷已搬运"); + } } StIvtCutpointivt cutPoint = cutpointivtService.getOneByCode(pointCode); param.put("config_code", "SlitterUpTrussTask"); 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 506156177..a19886175 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 @@ -76,14 +76,17 @@ public class OtherPdaServiceImpl implements OtherPdaService { throw new BadRequestException("点位[" + pointCode + "]已经存在任务！"); } JSONObject taskParam = new JSONObject(); - if (StrUtil.isNotEmpty(startPoint)){ - taskParam.put("point_code1", startPoint); - } + taskParam.put("point_code2", pointCode); taskParam.put("index_task", 1); taskParam.put("config_code", "SendWasteFoilAGVTask"); taskParam.put("create_mode", GeneralDefinition.PDA_CREATION); taskParam.put("task_status", TaskStatus.SURE_END.getCode()); + //起点不为空就是漏斗复位任务 + if (StrUtil.isNotEmpty(startPoint)){ + taskParam.put("point_code1", startPoint); + taskParam.put("task_status", TaskStatus.START_AND_POINT.getCode()); + } sendWasteFoilAGVTask.createTask(taskParam); JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/dao/mapper/PdmBiRawfoilworkorderMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/dao/mapper/PdmBiRawfoilworkorderMapper.xml index e4023198e..03b3e202d 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/dao/mapper/PdmBiRawfoilworkorderMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/dao/mapper/PdmBiRawfoilworkorderMapper.xml @@ -11,5 +11,12 @@ WHERE p.region_code = 'A1-HXZC' AND p.point_status = '4' AND IFNULL(w.workorder_id, '') ]]> '' + union ALL + + SELECT p.point_code as zc_point, + w.* + FROM st_ivt_hotpointivt p + LEFT JOIN pdm_bi_rawfoilworkorder w ON w.workorder_id = p.workorder_id + WHERE p.point_status = '04'; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoSendWasteFoilAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoSendWasteFoilAGVTask.java index 81bbffba7..42f8b3dc9 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoSendWasteFoilAGVTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoSendWasteFoilAGVTask.java @@ -1,6 +1,7 @@ package org.nl.wms.quartz; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.wms.sch.point.service.ISchBasePointService; @@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; +import java.util.stream.Collectors; /** * 自动创建从废箔起点开始的热任务 @@ -31,10 +33,11 @@ public class AutoSendWasteFoilAGVTask { log.info("查找废箔起点任务开始执行..."); // 获取下一条的任务 List waitTask = taskService.getTaskByConfigAndStatus(TASK_CODE, TaskStatus.SURE_END.getCode()); - if (taskService.checkAllWaiteByWasteFoil()) { + List waitTaskFilter = waitTask.stream().filter(task -> StrUtil.isEmpty(task.getPoint_code1())).collect(Collectors.toList()); + if (taskService.checkAllWaiteByWasteFoil() && CollectionUtil.isNotEmpty(waitTaskFilter)) { log.info("没有搬运中的废箔，执行创建从废箔起点到废箔终点的任务!"); // 都是等待状态的任务 - SchBaseTask task = waitTask.get(0); + SchBaseTask task = waitTaskFilter.get(0); // 查找废箔起点 List fbPoints = pointService.getAllBusinessNotTaskPoint("A1", "A1-FB", "1", "2", null, null); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java index 2e12ebf96..03bcc05d4 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java @@ -78,7 +78,7 @@ public class SchBasePointController { @GetMapping("/getWastePointList") @Log("获取区域下拉框") - public ResponseEntity getWastePointList(){ - return new ResponseEntity<>(schBasePointService.getWastePointList(),HttpStatus.OK); + public ResponseEntity getWastePointList(@RequestParam String point_type){ + return new ResponseEntity<>(schBasePointService.getWastePointList(point_type),HttpStatus.OK); } } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java index 52ed74807..73637cecc 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java @@ -128,5 +128,5 @@ public interface ISchBasePointService extends IService { List getAllBusinessTaskPoint(String area, String region, String pointType, String pointStatus, String vehicleType, String vehicleCode); - List getWastePointList(); + List getWastePointList(String point_type); } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index 8aa919b65..b9e0f014d 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -3,7 +3,6 @@ package org.nl.wms.sch.point.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -244,10 +243,18 @@ public class SchBasePointServiceImpl extends ServiceImpl getWastePointList() { + public List getWastePointList(String point_type) { - List list = getAllBusinessNotTaskPoint("A1", "A1-FB", null, "1", null, null); - return list.stream().filter(item -> item.getPoint_code().contains("ZD") || item.getPoint_code().contains("QD") ).collect(Collectors.toList()); + List list = getAllBusinessNotTaskPoint("A1", "A1-FB", null, null, null, null); + List zdList = list.stream().filter(item -> item.getPoint_code().contains("ZD")).collect(Collectors.toList()); + if ("1".equals(point_type)){ + List qdList = list.stream().filter(item -> item.getPoint_code().contains("QD") && "1".equals(item.getPoint_status())).collect(Collectors.toList()); + zdList.addAll(qdList); + return zdList; + } + List qdList = list.stream().filter(item -> item.getPoint_code().contains("QD") && "2".equals(item.getPoint_status())).collect(Collectors.toList()); + zdList.addAll(qdList); + return zdList; } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java index 2f23386e1..751401389 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java @@ -3,6 +3,7 @@ package org.nl.wms.sch.task_manage.tasks.hot; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; @@ -52,6 +53,7 @@ public class InHotTrussTask extends AbstractTask { private RedisUtils redisUtils; @Autowired private ISchBaseTaskService taskService; + @Override public void create() throws BadRequestException { @@ -59,6 +61,7 @@ public class InHotTrussTask extends AbstractTask { /** * todo: 烘烤时间与烘烤温度是否需要下发ACS？ + * * @param task / */ @Override @@ -67,10 +70,12 @@ public class InHotTrussTask extends AbstractTask { String requestParam = task.getRequest_param(); JSONObject requestObj = JSONObject.parseObject(requestParam); String orderCode = requestObj.getString("order_code"); + String isStorage = requestObj.getString("is_storage"); + String plan = requestObj.getString("plan"); String flag = "0"; PdmBiRawfoilworkorder order = rawfoilworkorderService.getByContainerName(orderCode); // TODO: 没有设置是否烘烤、时间、温度、不继续 - if (GeneralDefinition.YES.equals(order.getIs_baking())) { + if (ObjectUtil.isNotNull(order)&&GeneralDefinition.YES.equals(order.getIs_baking())) { String bakingTemperature = order.getBaking_temperature(); requestObj.put("baking_temperature", bakingTemperature); @@ -101,18 +106,36 @@ public class InHotTrussTask extends AbstractTask { SchBasePoint point = hotDjwList.get(0); task.setPoint_code2(point.getPoint_code()); } - if (hotDjwList.size() == 0){ + if (hotDjwList.size() == 0) { throw new BadRequestException("入烘箱没有找到存放母卷位置"); } } // todo: 需要烘烤，且是小卷，但是没有位置，需要将最快结束的烘箱组锁住 } else { - // 不需要烘烤，则送到暂存区（无需烘烤区 - 任务做完需要将点位设置为待分切） - List hotDjwList = pointService.getHotNotTaskPoint("A1", REGION_A1_HXZC, - "3", "1"); - if (hotDjwList.size() > 0) { - SchBasePoint point = hotDjwList.get(0); - task.setPoint_code2(point.getPoint_code()); + // 如果是去烘箱暂存的，找禁用的烘箱 + if (GeneralDefinition.YES.equals(isStorage)) { + List hotList = hotpointivtService.getNotTaskHotOven(plan, "0"); + for (StIvtHotpointivt hotPoint : hotList) { + String pointCode = hotPoint.getPoint_code(); + String pointTemperature = (String) redisUtils.hget(pointCode, "temperature"); + if (ObjectUtil.isNotEmpty(pointTemperature) && Integer.valueOf(pointTemperature) < 50 ) { + task.setPoint_code2(pointCode); + flag = "1"; + break; + } + } + if (ObjectUtil.isEmpty(task.getPoint_code2())){ + throw new BadRequestException("暂时没有可用的烘箱暂存位"); + } + + } else { + // 不需要烘烤，则送到暂存区（无需烘烤区 - 任务做完需要将点位设置为待分切） + List hotDjwList = pointService.getHotNotTaskPoint("A1", REGION_A1_HXZC, + "3", "1"); + if (hotDjwList.size() > 0) { + SchBasePoint point = hotDjwList.get(0); + task.setPoint_code2(point.getPoint_code()); + } } } @@ -165,8 +188,8 @@ public class InHotTrussTask extends AbstractTask { hotpointivt.setWorkorder_id(order.getWorkorder_id()); hotpointivt.setInstorage_time(DateUtil.now()); hotpointivt.setFull_vehicle_code(taskObj.getVehicle_code()); - // 02：烘烤中，03：暂存中 - hotpointivt.setPoint_status("0".equals(caching) ? "02" : "03"); + // 02：烘烤中，04：烘烤完毕暂存中 + hotpointivt.setPoint_status("0".equals(caching) ? "02" : "04"); // todo: 更新温度和倒计时 setHxUpdateByType(hotpointivt, taskFinishedType); hotpointivtService.updateById(hotpointivt); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/other/SendWasteFoilAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/other/SendWasteFoilAGVTask.java index 6b35083e5..c89edbd41 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/other/SendWasteFoilAGVTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/other/SendWasteFoilAGVTask.java @@ -112,10 +112,10 @@ public class SendWasteFoilAGVTask extends AbstractTask { BigDecimal weight = task.getBigDecimal("weight"); // 校验任务 SchBaseTask taskObj = taskService.getByCode(taskCode); - if (ObjectUtil.isNotEmpty(weight)) { - // 调用更新重量 - otherOperationService.acsRequestWasteFoilWeight(task); - } +// if (ObjectUtil.isNotEmpty(weight)) { +// // 调用更新重量 +// otherOperationService.acsRequestWasteFoilWeight(task); +// } // 根据传来的类型去对任务进行操作 if (TaskStatus.EXECUTING.equals(status) || ObjectUtil.isNotEmpty(task.getString("car_no"))) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode());