桁架理货出库流程修改

pang.jiabao

2024-08-20 68aafce5aaef75bc6505b899d380aa58e00067fa

桁架理货出库流程修改

 src/main/java/com/zy/asrs/entity/param/ZphjcdwcParam.java

@@ -12,4 +12,13 @@

    private Integer workNo; // 工作号

    // 换盘点站点
    private Integer sourceStaNo;

    // 组盘站点托盘码
    private String barcode;

    // 组盘站点
    private Integer site;

}

 src/main/java/com/zy/asrs/entity/result/ZphjcdwcVo.java

@@ -16,6 +16,8 @@

    private int staNo; // 目标站点

    private String barcode; // 托盘条码

    private int descFlag; // 拆垛出来托盘出库路径

}

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

@@ -1177,7 +1177,7 @@
        if (wrkMast == null) {
            throw new CoolException("工作档不存在：" + param.getBarcode());
        }
        if (wrkMast.getIoType() != 101 || wrkMast.getWrkSts() != 20) {
        if (wrkMast.getWrkSts() != 20) {
            throw new CoolException(wrkMast.getWrkNo() + ",工作档类型：" + wrkMast.getIoType() + "工作状态：" + wrkMast.getWrkSts() + ",不匹配");
        }


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

@@ -2,7 +2,6 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
@@ -1591,8 +1590,8 @@
    @Transactional
    public R zphjCdwc(ZphjcdwcParam param) {

        if (Cools.isEmpty(param.getWorkNo())) {
            throw new CoolException("工作号不能为空！");
        if (Cools.isEmpty(param.getWorkNo(),param.getBarcode(),param.getSourceStaNo(),param.getSite())) {
            return R.parse("参数不能为空，请检查入参");
        }
        WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
        if (wrkMast == null) {
@@ -1602,60 +1601,59 @@
            throw new CoolException("工作档当前状态不为42/出库类型不为拣料！");
        }

        // 保存工作主档历史档
        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
            throw new CoolException("保存工作主档历史档失败");
        }
        // 获取目标站
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", wrkMast.getIoType() - 50)
                .eq("stn_no", wrkMast.getStaNo()) // 作业站点 = 拣料出库的目标站
                .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)) {
            throw new CoolException("入库路径不存在");
        }
        // 堆垛机站点(目标站)
        Integer staNo = staDesc.getCrnStn();
        // 更新工作类型103->53
        wrkMast.setIoType(53);
        wrkMast.setWrkSts(52L); // 工作状态42->52.设备上走（拆垛完成）
        // 目标站点源站点转换
        wrkMast.setSourceStaNo(wrkMast.getStaNo());
        wrkMast.setStaNo(staNo);
        // 目标库位=源库位
        wrkMast.setLocNo(wrkMast.getSourceLocNo());
        // 源库位清除
        wrkMast.setSourceLocNo("");
        wrkMast.setModiTime(new Date());

        int outStaNo = 0; // 出库源站点
        if (staNo == 3044 || staNo == 3045) {
             outStaNo = 3046;
        } else if(staNo == 3040 || staNo == 3041) {
             outStaNo = 3042;
        }
        if (outStaNo == 0) {
            throw new CoolException("出库源站点转换有误：" + staNo);
        }

        // 获取出库物料
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));

        // 创建桁架理货出库的工作档
        int work = create111Work(wrkMast, wrkDetls, param.getSite(), wrkMast.getStaNo(), param.getBarcode());

        int descFlag = getType(wrkDetls);

        // get0原托盘回流信息，get1拆垛出来物料出库信息
        List<ZphjcdwcVo> zphjcdwcVos = new ArrayList<>();
        ZphjcdwcVo zphjcdwcVo1 = new ZphjcdwcVo();
        zphjcdwcVo1.setWorkNo(wrkMast.getWrkNo());
        zphjcdwcVo1.setStaNo(wrkMast.getStaNo());
        zphjcdwcVo1.setSourceStaNo(wrkMast.getSourceStaNo());
        zphjcdwcVo1.setStaNo(wrkMast.getSourceStaNo());
        zphjcdwcVo1.setSourceStaNo(param.getSourceStaNo());
        zphjcdwcVo1.setBarcode(wrkMast.getBarcode());
        zphjcdwcVos.add(zphjcdwcVo1);

        ZphjcdwcVo zphjcdwcVo2 = new ZphjcdwcVo();
        zphjcdwcVo2.setSourceStaNo(outStaNo);
        zphjcdwcVo2.setStaNo(3106); // 3106/3077
        zphjcdwcVo2.setWorkNo(work);
        zphjcdwcVo2.setSourceStaNo(param.getSite());
        zphjcdwcVo2.setStaNo(wrkMast.getStaNo());
        zphjcdwcVo2.setBarcode(param.getBarcode());
        zphjcdwcVo2.setDescFlag(descFlag);
        zphjcdwcVos.add(zphjcdwcVo2);


        // 保存工作主档历史档
        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
            throw new CoolException("保存工作主档历史档失败");
        }
        // 获取目标站
//        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
//                .eq("type_no", wrkMast.getIoType() - 50)
//                .eq("stn_no", wrkMast.getSourceStaNo()) // 作业站点 = 拣料出库的目标站
//                .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
//        StaDesc staDesc = staDescService.selectOne(wrapper);
//        if (Cools.isEmpty(staDesc)) {
//            throw new CoolException("入库路径不存在");
//        }
        // 堆垛机站点(目标站)
//        Integer staNo = staDesc.getCrnStn();
        // 更新工作类型103->53
        wrkMast.setIoType(53);
        wrkMast.setWrkSts(52L); // 工作状态42->52.设备上走（拆垛完成）
        // 目标站点源站点转换
        wrkMast.setStaNo(wrkMast.getSourceStaNo());
        wrkMast.setSourceStaNo(param.getSourceStaNo());

        // 目标库位=源库位
        wrkMast.setLocNo(wrkMast.getSourceLocNo());
        // 源库位清除
        wrkMast.setSourceLocNo("");
        wrkMast.setModiTime(new Date());

        // 更新工作主档
        wrkMastService.updateById(wrkMast);
@@ -1672,12 +1670,54 @@
    }

    /**
     * 创建桁架理货出库的工作档
     */
    private int create111Work(WrkMast wrk, List<WrkDetl> wrkDetls, Integer site, Integer staNo,String barcode) {
        int workNo = commonService.getWorkNo(4);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(2L); // 工作状态：设备上走
        wrkMast.setIoType(111); // 入出库状态：111.理货贴标出库
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(wrk.getCrnNo());
        wrkMast.setSourceStaNo(site);
        wrkMast.setStaNo(staNo);
        wrkMast.setSourceLocNo(wrk.getSourceLocNo());
        wrkMast.setBarcode(barcode); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setCtnType(1); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);

        // 插入工作档
        wrkMastService.insert(wrkMast);

        // 插入工作档明细
        for (WrkDetl wrkDetl:wrkDetls) {
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setBarcode(barcode);
            wrkDetl.setZpallet(barcode);
            wrkDetlService.insert(wrkDetl);
        }

        return workNo;
    }

    /**
     * 根据出库物料明细判断是否去贴标(单卷贴标，多卷不贴标)
     * @param wrkDetls 物料明细
     * @return 0.多卷不贴标路径，1.单卷贴标路径
     * @return 1.多卷直接出路径，4.单卷贴标路径
     */
    private int getType(List<WrkDetl> wrkDetls) {
        return wrkDetls.size() > 1 ? 0 : 1; // 一条记录就是一卷
        return wrkDetls.size() > 1 ? 1 : 4; // 一条记录就是一卷
    }

    public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo,String barcode) {

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -173,21 +173,21 @@
                        }

                        // 更新订单完成数量
                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetl==null){
                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        }
                        try {
                            if(!Cools.isEmpty(orderDetl)){
                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(),wrkDetl.getAnfme())){
//                                    exceptionHandle("拣料入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                    return FAIL.setMsg("拣料入库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                                }
                            }
                        } catch (Exception ignore){}
//                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
//                        if (orderDetl==null){
//                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
//                        }
//                        try {
//                            if(!Cools.isEmpty(orderDetl)){
//                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
//                                        orderDetl.getBatch(),wrkDetl.getAnfme())){
////                                    exceptionHandle("拣料入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
////                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
//                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//                                    return FAIL.setMsg("拣料入库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
//                                }
//                            }
//                        } catch (Exception ignore){}

                    }
                    // 修改库位状态 Q ====>> F
@@ -419,6 +419,34 @@
                        }
                    }
                    break;
                // 理货贴标出库
                case 111:
                    List<WrkDetl> wrkDetls111 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                    if (wrkDetls111.isEmpty()) {
//                        exceptionHandle("全板出库 ===>> 工作明细档为空；[workNo={0}]", wrkMast.getWrkNo());
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return FAIL.setMsg("全板出库 ===>> 工作明细档为空; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                    }
                    for (WrkDetl wrkDetl : wrkDetls111) {
                        // 更新订单完成数量
                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetl == null) {
                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        }
                        try {
                            if (!Cools.isEmpty(orderDetl)) {
                                if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(), wrkDetl.getAnfme())) {
//                                    exceptionHandle("拣料入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                    return FAIL.setMsg("拣料入库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                                }
                            }
                        } catch (Exception ignore) {
                        }
                    }
                    break;
                default:
                    break;
            }