四期

zhangc

2025-03-06 fbdad64fe45fa120beb4332e7a3615856d05ab96

 src/main/java/com/zy/asrs/controller/AgvOpenController.java

@@ -7,7 +7,6 @@
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.WrkMastExecute;
import com.zy.asrs.entity.param.AgvTaskCallBackParam;
@@ -65,8 +64,6 @@
    @PostMapping("/task/event/status")
    @AppAuth(memo = "ESS任务回调")
    public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request){




        //save api log (appkey 后续添加)
@@ -172,7 +169,6 @@
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {



            //修改AGV工作档的工作状态为205.工作完成
            agvWrkMast.setWrkSts(205L);

@@ -219,7 +215,14 @@
                case 53:
                // 盘点再入库
                case 57:
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",null);
                    AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
                    String locSts = "O";
                    if (byDevNo != null && byDevNo.getLocSts() == "R") {
                        locSts = "O";
                    } else {
                        locSts = byDevNo.getLocSts();
                    }
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);
                    break;
            }
            //if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){