#

LSH

2024-03-29 1fa87a730c78cff6005b2231afa9d7976e03e46f

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.controller.CrnController;
import com.zy.asrs.controller.OpenController;
@@ -403,10 +404,18 @@
                        if (taskWrk == null) {
                            continue;
                        }
                        siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()),taskWrk.getWrkNo().shortValue(),(short)0,"Y",false,false);
                        taskWrk.setStatus(5);
                        taskWrk.setWrkSts(14);
                        taskWrkService.updateById(taskWrk);
                        log.info("下发输送线任务：taskWrk:"+JSON.toJSONString(taskWrk));
                        R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false);
                        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r));
                        if (jsonObject.getInteger("code").equals(200)){
                            log.info("下发输送线任务成功：taskWrk:"+JSON.toJSONString(taskWrk));
                            taskWrk.setStatus(5);
                            taskWrk.setWrkSts(14);
                            taskWrkService.updateById(taskWrk);
                        }else {
                            log.error("下发输送线任务失败：taskWrk:"+JSON.toJSONString(taskWrk));
                            log.error("下发输送线任务失败：异常信息:"+JSON.toJSONString(r));
                        }
                    }
                }

@@ -937,7 +946,7 @@

                crnController.crnTaskComplete(crnOperatorParam);
                if(!Cools.isEmpty(taskWrk)){
                    if(taskWrk.getIoType()==1&&taskWrk.getWrkSts()==3){
                    if(taskWrk.getIoType()==1 && taskWrk.getWrkSts()==3){
                        taskWrk.setWrkSts(4);//入库完成
                        taskWrk.setStatus(5);//完结
                        //更新库位状态