bug修复

zyx

2024-04-03 53e23d4b25ee16b696a5c7094da4f1accaaa4e83

bug修复

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

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

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -12,9 +13,11 @@
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWaitPakin;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvWaitPakinService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +35,8 @@
    private AgvWaitPakinService agvWaitPakinService;
    @Autowired
    private AgvBasDevpService agvBasDevpService;
    @Autowired
    private OrderDetlService orderDetlService;

    @RequestMapping(value = "/waitPakin/{id}/auth")
    @ManagerAuth
@@ -100,6 +105,24 @@
            }else {
                return R.error("料箱码为" + entity.getSuppCode() + "已绑定站点，请先从AGV站点管理解绑该料箱");
            }
            //订单回滚
            if(!Cools.isEmpty(entity.getOrderNo())){
                String orderNo = entity.getOrderNo();
                if(orderNo.contains("{")){
                    JSONArray orderArray = JSON.parseArray(orderNo);
                    for (Object o : orderArray){
                        JSONObject jsonobject = (JSONObject) o;
                        OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(),entity.getMatnr(),entity.getThreeCode(),entity.getDeadTime());
                        orderDetl.setQty(orderDetl.getQty() - entity.getAnfme());
                        orderDetlService.updateById(orderDetl);
                    }

                }else {
                    OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(entity.getOrderNo(),entity.getMatnr(),entity.getThreeCode(),entity.getDeadTime());
                    orderDetl.setQty(orderDetl.getQty() - entity.getAnfme());
                    orderDetlService.updateById(orderDetl);
                }
            }

        }
        return R.ok();

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

@@ -463,6 +463,12 @@

            DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));

            if(docType.getPakin() == 1){
                uuid += "_I";
            }else {
                uuid += "_O";
            }

            Order order = orderService.selectByNo(uuid);
            if (null == order) {
                order = new Order(

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

@@ -592,6 +592,18 @@
            }
        }

        //保存工作档以及明细
        agvWrkMastLogService.save(wrkMast);
        agvWrkDetlLogService.save(wrkMast.getWrkNo());

        //删除工作档以及明细
        if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
            throw new CoolException("删除失败，请联系管理员");
        }

        if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10){
            return;
        }

        //订单回滚
        //List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -616,16 +628,6 @@
                }
            }
        });


        //保存工作档以及明细
        agvWrkMastLogService.save(wrkMast);
        agvWrkDetlLogService.save(wrkMast.getWrkNo());

        //删除工作档以及明细
        if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
            throw new CoolException("删除失败，请联系管理员");
        }

    }


 src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java

@@ -162,7 +162,7 @@
    /*
    自动生成空板出库任务
     */
    //@Scheduled(cron = "0/10 * * * * ? ")
    @Scheduled(cron = "0/10 * * * * ? ")
    public void autoEmptyOut(){
        boolean packageEmptyAutoOUt = Cools.eq("Y",Parameter.get().getPackageEmptyAutoOUt());
        boolean mateEmptyAutoOut = Cools.eq("Y",Parameter.get().getMateEmptyAutoOut());