bug修复；下发任务给rcs携带货架码

zhang

1 天以前 5701eb6693c654d53f1bba460eb3a417d495b344

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

@@ -15,6 +15,8 @@
import com.zy.common.web.BaseController;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +33,8 @@
import java.util.EnumSet;
import java.util.Map;

import static org.reflections.Reflections.log;

/**
 * 上报事件类型（eventType）：
 *  task：上报任务状态。
@@ -40,7 +44,7 @@
 *  robot_reach：机器人到达工作站。
 *  weight：称重事件回调。
 *  rfid：RFID识别事件回调。
 *
 * <p>
 * 任务状态（status）：
 *  success：成功。
 *  fail：失败。
@@ -51,6 +55,8 @@
@RestController
@RequestMapping("/agv")
public class AgvOpenController extends BaseController {

    private static final Logger log = LoggerFactory.getLogger(AgvMobileController.class);

    @Autowired
    AgvWrkMastService agvWrkMastService;
@@ -83,6 +89,15 @@
                logPost(param, JSONObject.toJSONString(r), false);
                return r;
            }
        }
        try {
            if (!Cools.isEmpty(agvWrkMast.getBarcode()) && !Cools.isEmpty(param.getPodCode())) {
                if (!agvWrkMast.getBarcode().equals(param.getPodCode())) {
                    log.info("AGV回调的返回的托盘码和工作档托盘不一致,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        if (agvWrkMast.getIoType().equals(121)) {
            try {
@@ -168,14 +183,18 @@
        @Transactional
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {


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

            //出库任务 101.出库 || 103.拣料出库 || 107.盘点出库
            if (agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) {
                //修改出库站点状态
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getLocNo());
                if (byDevNo != null) {
                    log.info("出库任务进入站点===>>站点码：{}，站点状态{}", byDevNo.getDevNo(), byDevNo.getLocSts());
                    //修改出库站点状态
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());

                }
            }
            //出库任务 110.空板出库
            if (agvWrkMast.getIoType() == 110) {
@@ -184,6 +203,8 @@
            }
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.updateById(agvWrkMast);


        }
    },
    /**
@@ -213,17 +234,43 @@
                case 10:
                    // 拣料入库任务
                case 53:
                    // 站点退回
                case 58:
                    // 盘点再入库
                case 57:
                    AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
                    String locSts = "O";
                    if (byDevNo != null && "R".equals(byDevNo.getLocSts())) {
                        locSts = "O";
                    } else {
                        locSts = byDevNo.getLocSts();
                    if (byDevNo != null) {
                        assert log != null;
//                        if (!Cools.isEmpty(agvWrkMast.getBarcode())) {
//                            AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", agvWrkMast.getBarcode()));
//                            if (!Cools.isEmpty(agvBasDevp) && agvBasDevp.getLocSts().equals("F") && !agvBasDevp.getDevNo().equals(byDevNo.getDevNo())) {
//                                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(), locSts, "", null);
//                            }
//                        }
                        log.info("料架离开时当前站点状态:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());
                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
                            log.info("料架离开时当前站点状态保持不变1:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());
                            locSts = byDevNo.getLocSts();
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, byDevNo.getBarcode(), null);
                        } else {
                            log.info("料架离开时当前站点状态保持不变2:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());
                            locSts = "O";
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);
                        }

                    }
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);
                    break;
            }

            if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 114) {
                //更新库存明细
                agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(), agvWrkMast.getAppeUser());
                //修改源库位状态为O
                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
            } else if (agvWrkMast.getIoType() == 109 && !agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
                //修改源库位状态为O
                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
            }
            //if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){
            //    //修改源站点状态为O.空，以及解绑托盘条码
@@ -319,6 +366,15 @@
        }

    }

    public static void main(String[] args) {
        try {
            String s = null;
            System.out.println(s.equals("1"));
        }catch (Exception e){

        }
    }
}