优化异常处理及订单同步逻辑

zhangc

2025-01-07 aa22bc31604e33e4d86cf7f4918a26192760209b

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

@@ -1,5 +1,6 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
@@ -10,14 +11,17 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.OrderServiceImpl;
import com.zy.common.web.BaseController;
import io.swagger.models.auth.In;
import lombok.Synchronized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.*;
import java.util.stream.Collectors;
@@ -28,7 +32,7 @@
 */
@RestController
@RequestMapping("agvMobile")
public class AgvMobileController extends BaseController  {
public class AgvMobileController extends BaseController {


    private static final Logger log = LoggerFactory.getLogger(AgvMobileController.class);
@@ -52,13 +56,15 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private FlowLogService flowLogService;
    @Autowired
    private OrderServiceImpl orderService;


    /*
    locno？组托+绑定暂存位 ： 组托
     */
    @PostMapping("/comb/auth")
    public R comb(@RequestBody CombParam combParam){
    public R comb(@RequestBody CombParam combParam) {
        agvMobileService.comb(combParam, getUserId());

        return R.ok();
@@ -67,7 +73,7 @@
    //    再次拣料
    @RequestMapping("/pick/again/auth")
    @ManagerAuth(memo = "再次拣料")
    public R pickAgain(@RequestBody PickParam pickParams){
    public R pickAgain(@RequestBody PickParam pickParams) {
        agvMobileService.pickAgain(pickParams, 1l);
        return R.ok("拣料成功");
    }
@@ -76,11 +82,11 @@
    绑定货架条码与暂存位
     */
    @PostMapping("/combBinging/auth")
    public R combBinding(@RequestBody Map<String,Object> map){
    public R combBinding(@RequestBody Map<String, Object> map) {
        String barcode = map.get("barcode").toString();
        String stationCode = map.get("stationCode").toString();
        Short containerType = Short.valueOf(barcode.substring(0,2));
        agvMobileService.combBinding(barcode,stationCode,containerType);
        Short containerType = Short.valueOf(barcode.substring(0, 2));
        agvMobileService.combBinding(barcode, stationCode, containerType);
        return R.ok("货架绑定站点成功");
    }

@@ -88,9 +94,9 @@
    获取当前已绑定的还没生成工作档的暂存位
     */
    @PostMapping("/getBasDevp/auth")
    public R getBasDevpByFloor(@RequestBody Map<String,Object> map){
    public R getBasDevpByFloor(@RequestBody Map<String, Object> map) {
        String floor = map.get("floor").toString();
        if("1".equals(floor) || "3".equals(floor)){
        if ("1".equals(floor) || "3".equals(floor)) {
            return R.ok(agvMobileService.getAgvBasDevpByFloor(Integer.parseInt(floor)));
        }
        return R.error("参数错误");
@@ -100,7 +106,7 @@
    获取输送线站点
     */
    @PostMapping("/getBasDevp/noCacheShelves/auth")
    public R getBasDevpByNoCacheShelves(){
    public R getBasDevpByNoCacheShelves() {
        return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves());
    }

@@ -109,15 +115,15 @@
     */
    @PostMapping("/pakin/auth")
    @Synchronized
    public R pakin(@RequestBody Map<String,Object> map){
    public R pakin(@RequestBody Map<String, Object> map) {
        List<String> devNos = (List<String>) map.get("devNo");

        List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
            return agvBasDevpService.selectById(devNo);
        }).collect(Collectors.toList());

        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
        
        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(), false);

        return R.ok("生成工作档成功");
    }

@@ -128,13 +134,14 @@
    @Synchronized
    @Transactional
    @ManagerAuth(memo = "启动入库")
    public R startPakin(@RequestBody AgvMobileStartPakin params){
    public R startPakin(@RequestBody AgvMobileStartPakin params) {
        log.info("启动入库,{}", JSON.toJSONString(params));
        // 组托
        params.getCombParams().forEach(combParam -> {
            agvMobileService.comb(combParam,getUserId());
            agvMobileService.comb(combParam, getUserId());
        });
        params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
        workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);
        params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));
        workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false);

        return R.ok("生成工作档成功");
    }
@@ -145,11 +152,11 @@
    @PostMapping("/pakin/empty/auth")
    @Synchronized
    @ManagerAuth(memo = "空板入库")
    public R pakinEmpty(@RequestBody AgvMobileStartParam params){
    public R pakinEmpty(@RequestBody AgvMobileStartParam params) {

        for (AgvMobileStartParam.Pda pda : params.getPad()) {
            pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
            workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId(),false);
            pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
            workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
        }

        return R.ok();
@@ -161,10 +168,10 @@
    @PostMapping("/pakout/empty/auth")
    @Synchronized
    @ManagerAuth(memo = "空板出库")
    public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
    public R pakoutEmpty(@RequestBody AgvMobileStartParam params) {

        for (AgvMobileStartParam.Pda pda : params.getPad()) {
            workService.emptyPlateOut(pda.getDevNo(),pda.getContainerType(), getUserId());
            workService.emptyPlateOut(pda.getDevNo(), pda.getContainerType(), getUserId());
        }

        return R.ok();
@@ -174,7 +181,7 @@
    空板出库货架码选择
     */
    @PostMapping("/pakout/empty/container/selector/auth")
    public R containerType(@RequestBody HashMap<String,String> params){
    public R containerType(@RequestBody HashMap<String, String> params) {

        String devNo = params.get("devNo");
        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
@@ -182,12 +189,12 @@
        return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));

    }
    

    /*
    查询库存 入库订单与销售单号
     */
    @PostMapping("/query/locDetl/v1")
    public R queryAgvLocDetl(@RequestBody HashMap<String,String> params){
    public R queryAgvLocDetl(@RequestBody HashMap<String, String> params) {

        String orderNo = params.get("orderNo");
        String threeCode = params.get("threeCode");
@@ -209,7 +216,7 @@
        for (AgvLocDetl agvLocDetl : agvLocDetls) {
            AgvLocMast agvLocMast = new AgvLocMast();
            if (Cools.isEmpty(floor)) {
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
            } else {
                // 如果是加工单 只在 lev1 = 1 查库存
                if ("JG".equals(orderNo.substring(0,2))) {
@@ -374,24 +381,23 @@
        AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
        AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));

        String barcode1 =  agvLocMastByLocNo.getBarcode();
        String barcode1 = agvLocMastByLocNo.getBarcode();



        if((!Cools.eq("F",agvLocMastByLocNo.getLocSts())
                && !Cools.eq("D",agvLocMastByLocNo.getLocSts()))){
        if ((!Cools.eq("F", agvLocMastByLocNo.getLocSts())
                && !Cools.eq("D", agvLocMastByLocNo.getLocSts()))) {

            return R.error("库位状态不为F或者D，无法维护");

        }
        // -------------1-----------------------------
        //库位信息为空 货架信息不为空
        if(Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)){
        if (Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)) {
            //更新货架信息的库位为当前库位
            listByContainerCode.forEach(agvLocDetl -> {
                String sourceLoc = agvLocDetl.getLocNo();
                agvLocDetl.setLocNo(locNo);
                agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
                agvLocDetlService.updateLocNo(locNo, sourceLoc, agvLocDetl);
            });

            agvLocMastByLocNo.setLocSts("F");
@@ -403,6 +409,9 @@
                agvLocMastByContainerCode.setBarcode(barcode1);
                agvLocMastService.updateById(agvLocMastByContainerCode);
            }
            // 保存调整记录
            AdjDetl adjDetl = new AdjDetl();


            return R.ok("维护成功");
        }
@@ -503,6 +512,9 @@
            for (AgvLocDetl agvLocDetl : agvLocDetls) {
                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                if (orderDetl == null) {
                    throw new CoolException("订单明细不存在");
                }
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
@@ -523,6 +535,7 @@
        List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        params.get("dbList");
        Object mT = params.get("moveType");
        String orderNo = params.get("orderNo").toString();
        String moveType = "";
        Integer ioType = 0;
        if (mT.equals("unAuto")) {
@@ -557,6 +570,7 @@
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                wrkDetl.sync(agvLocDetl);
                wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
                wrkDetl.setModel(orderNo);
                wrkDetl.setIoTime(now);
                wrkDetl.setAppeUser(getUserId());
                wrkDetl.setAppeTime(now);
@@ -565,10 +579,13 @@
                if (!agvWrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作明细失败");
                }

                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
//                FlowLog flowLog = new FlowLog();
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                // 判断订单是否超量
                if (orderDetl.getQty() >= orderDetl.getAnfme()) {
                    throw new CoolException("调拨单:" + orderNo + "的<" + agvLocDetl.getMatnr() + ">已完成调拨数量,请检查!");
                }
                //                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setSpare2(wrkMast.getWrkNo().toString());
//                flowLog.setLocNo(wrkMast.getSourceLocNo());
@@ -595,8 +612,16 @@
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("订单号：{"+orderNo+"}更新订单明细失败！ 异常物料:"+agvLocDetl.getMatnr()+"(半成品调拨单任务)" );
                }
                // 更新订单状态
                Order order = orderService.selectByNo(orderDetl.getOrderNo());
                Long settle = order.getSettle();
                if (settle == 1L) {
                    if (!orderService.updateSettle(order.getId(),2L,getUserId())) {
                        throw new CoolException("订单号：{"+order.getOrderNo()+"}更新订单状态：1-->2 失败！(半成品调拨单任务)" );
                    }
                }
            }
            // 更新源库位
@@ -615,6 +640,7 @@
        Date now = new Date();
        List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        params.get("dbList");
        String orderNo = params.get("orderNo").toString();
        for (HashMap<String, String> map : dbList) {
            String locNo = map.get("locNo");
            String barcode = map.get("suppCode");
@@ -645,11 +671,19 @@
                // 更新订单
                // 先查询库订单明细 所属的订单

                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                }
                // 更新订单状态
                Order order = orderService.selectByNo(orderNo);
                Long settle = order.getSettle();
                if (settle == 1L) {
                    if (!orderService.updateSettle(order.getId(),2L,getUserId())) {
                        throw new CoolException("订单号：{"+order.getOrderNo()+"}更新订单状态：1-->2 失败！(半成品调拨单任务)" );
                    }
                }
            }
            // 更新源库位
            AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));