不保存物料信息

pang.jiabao

2024-10-24 41f4305e805f10b0fdc3bd3089f56c394f3ed59e

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

@@ -1292,22 +1292,27 @@
                    wrkDetl.setSpecs(String.valueOf(roll.getSplices())); // 接头
                    wrkDetl.setAnfme(1.0);
//                    wrkDetl.setThreeCode(null); // 通过mes或excel导入检测是否合格 0不合格，1 合格
//                    wrkDetl.setDeadWarn(); // 理货标识 0默认，1理货中，2理货完成w
//                    wrkDetl.setInspect(); // 订单明细中用，标识备货的状态 0未备货，1备货中，2备货完成
//                    wrkDetl.setDanger(); // 订单明细中用，标识跨巷道移库 0未移库，1移库中，2移库完成
                    wrkDetl.setIoTime(now);
                    wrkDetl.setAppeTime(now);
                    wrkDetl.setAppeUser(21L); // root
                    wrkDetl.setModiUser(21L); // root
                    wrkDetl.setModiTime(now);
                    if (!wrkDetlService.insert(wrkDetl)) {
                        throw new CoolException("保存工作明细失败");
                    }

                    // 物料表备份一份
                    Mat mat = new Mat();
                    mat.sync(wrkDetl);
                    mat.setTagId(6L);
                    mat.setCreateTime(now);
                    mat.setUpdateTime(now);
                    if (!matService.insert(mat)) {
                        throw new CoolException("备份物料表失败");
                    }
//                    Mat mat = new Mat();
//                    mat.sync(wrkDetl);
//                    mat.setTagId(6L);
//                    mat.setCreateTime(now);
//                    mat.setUpdateTime(now);
//                    if (!matService.insert(mat)) {
//                        throw new CoolException("备份物料表失败");
//                    }

                });
            }
@@ -1329,7 +1334,7 @@
        // 返回GWCS目标信息
        pushStaNoToGwcs(param.getPalletizingNo(),dto.getStaNo(),dto.getWorkNo(),param.getBarcode(),"gwms申请入库后推送gwcs");

        return R.ok();
        return null;
    }

    @Override
@@ -1599,7 +1604,7 @@
    @Transactional
    public R zphjCdwc(ZphjcdwcParam param) {

        if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite())) {
        if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite(),param.getBarcode())) {
            return R.parse("参数不能为空，请检查入参");
        }
        WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
@@ -1617,7 +1622,7 @@
        LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());

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

        int descFlag = getType(wrkDetls);

@@ -1641,7 +1646,7 @@
        zphjcdwcVo2.setWorkNo(work);
        zphjcdwcVo2.setSourceStaNo(param.getSite());
        zphjcdwcVo2.setStaNo(wrkMast.getStaNo());
        zphjcdwcVo2.setBarcode(param.getSite() == 3046 ? "T1146" : "T1142");
        zphjcdwcVo2.setBarcode(param.getBarcode());
        zphjcdwcVo2.setDescFlag(descFlag);
        zphjcdwcVos.add(zphjcdwcVo2);

@@ -1689,11 +1694,18 @@
            wrkMast.setWrkSts(52L); // 工作状态42->52.设备上走（拆垛完成）
            wrkMast.setSourceStaNo(param.getSourceStaNo());
            wrkMast.setStaNo(oneFloorIn[wrkMast.getCrnNo()]);
            // 源库位
            LocMast staLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
            // 目标库位=源库位
            wrkMast.setLocNo(wrkMast.getSourceLocNo());
            // 源库位清除
            wrkMast.setSourceLocNo("");
            wrkMast.setModiTime(new Date());

            // 更新新库位状态 Q
            staLocMast.setLocSts("Q");
            staLocMast.setModiTime(new Date());
            locMastService.updateById(staLocMast);
        }

        // 更新工作主档
@@ -1714,7 +1726,7 @@
    @Override
    public R kxlhCdwc(KxlhcdwcParam param) {

        if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite())) {
        if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite(),param.getBarcode())) {
            return R.parse("参数不能为空，请检查入参");
        }
        WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
@@ -1819,7 +1831,7 @@
            zphjcdwcVo.setWorkNo(wrkMast1.getWrkNo());
            zphjcdwcVo.setStaNo(wrkMast1.getStaNo());
            zphjcdwcVo.setSourceStaNo(site);
            zphjcdwcVo.setBarcode(site == 3046 ? "T1046" : "T1042");
            zphjcdwcVo.setBarcode(param.getBarcode());
            zphjcdwcVos.add(zphjcdwcVo);
        }

@@ -1930,7 +1942,7 @@
            if (!Cools.isEmpty(response)) {
                success = true;
            } else {
                log.error(message + "失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
                log.error(message + "失败！！！url：{}；request：{}；response：{}", MesConstant.GWCS_IP_PORT + MesConstant.GWCS_FPKW_URL, body, response);
            }
        } catch (Exception e) {
            log.error(message + "异常：{}", e);