成品入库修改

pang.jiabao

2024-08-15 83425ecab7ea13a6f5cbe877b1313f3e7a42b8b1

成品入库修改

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

@@ -41,6 +41,15 @@
        return R.ok(openService.gwmsGenerateInventory(param));
    }

    @PostMapping("/fxprk")
    @AppAuth(memo = "反修品入库")
    public synchronized R fxprk(@RequestHeader(required = false) String appkey,
                                                @RequestBody List<FxprkParam> param,
                                                HttpServletRequest request) {
        auth(appkey, param, request);
        return R.ok(openService.fxprk(param));
    }

    @PostMapping("/zxrk")
    @AppAuth(memo = "GWCS到达堆垛机入库站点请求ZWCS执行")
    public synchronized R crnExecute(@RequestHeader(required = false) String appkey,

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

New file
@@ -0,0 +1,27 @@
package com.zy.asrs.entity.param;

import lombok.Data;

/**
 * @author pang.jiabao
 * @description 反修品入库
 * @createDate 2024/8/15 13:29
 */
@Data
public class FxprkParam {

    /**
     * 包装组号
     */
    private String packageGroupNo;

    /**
     * 木箱位置
     */
    private String boxPos;

    /**
     * 站点
     */
    private Integer palletizingNo;
}

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

@@ -21,7 +21,6 @@
        private String rollType; // 管芯类型
        private String wideInWidth; // 实测宽幅（分切成品下料）
        private String thickness; // 生箔厚度（分切成品下料）
        private String fqTime; // 分切下料时间
        private List<Rolls> rolls; // 卷集合
    }
    @Data
@@ -33,5 +32,6 @@
        private Integer splices; //接头 个
        private Double netWeight; // 净重
        private Double grossWeight; // 毛重
        private String fqTime; // 分切下料时间
    }
}

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -16,6 +16,16 @@
    R gwmsGenerateInventory(GwmsGenerateInventoryDto param);

    /**
     * 产品合格校验
     */
    void prodCheck(List<ProdCheckParam> param);

    /**
     * 反修品入库
     */
    String fxprk(List<FxprkParam> param);

    /**
     *GWMS到达目标站点请求ZWCS执行入库
     */
    String crnExecute(CrnExecuteParam param);
@@ -99,8 +109,5 @@

    void updateBarcode();

    /**
     * 产品合格校验
     */
    void prodCheck(List<ProdCheckParam> param);

}

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

@@ -1025,6 +1025,78 @@

    @Override
    @Transactional
    public String fxprk(List<FxprkParam> param) {
//
//        // 根据包装组号获取到木箱卷信息
//        List<Mat> list = matService.selectList(new EntityWrapper<Mat>().eq("brand", param.getPackageGroupNo()));
//        if (list.isEmpty()) {
//            throw new CoolException("没有查询到该包装组号信息：" + param.getPackageGroupNo());
//        }
//
//        LocTypeDto locTypeDto = new LocTypeDto();
//        locTypeDto.setLocType1((short) 1);
//        StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto, 0);
//
//        // 返回GWCS目标信息
//        pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo());
//
//        int workNo = dto.getWorkNo();
//        Date now = new Date();
//        // 生成工作档
//        WrkMast wrkMast = new WrkMast();
//        wrkMast.setWrkNo(workNo);
//        wrkMast.setIoTime(new Date());
//        wrkMast.setWrkSts(1L); // 工作状态：设备上走
//        wrkMast.setIoType(1); // 入出库状态：1.入库
//        wrkMast.setIoPri(13D); // 优先级
//        wrkMast.setCrnNo(dto.getCrnNo());
//        wrkMast.setSourceStaNo(param.getPalletizingNo());
//        wrkMast.setStaNo(dto.getStaNo());
//        wrkMast.setLocNo(dto.getLocNo());
//        wrkMast.setBarcode(list.get(0).getBarcode()); // 托盘码
//        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);
//        boolean res = wrkMastService.insert(wrkMast);
//        if (!res) {
//            throw new CoolException("保存工作档失败");
//        }
//
//        for (Mat obj : list) {
//            WrkDetl wrkDetl = new WrkDetl();
//            wrkDetl.setWrkNo(wrkMast.getWrkNo());
//            wrkDetl.setAnfme(1.0);
//            wrkDetl.sync(obj);
//            wrkDetl.setIoTime(now);
//            wrkDetl.setAppeTime(now);
//            wrkDetl.setModiTime(now);
//            if (!wrkDetlService.insert(wrkDetl)) {
//                throw new CoolException("保存工作明细失败");
//            }
//        }
//
//        // 更新目标库位状态
//        LocMast locMast = locMastService.selectById(dto.getLocNo());
//        if (locMast.getLocSts().equals("O")) {
//            locMast.setLocSts("S"); // S.入库预约
//            locMast.setModiTime(now);
//            if (!locMastService.updateById(locMast)) {
//                throw new CoolException("改变库位状态失败");
//            }
//        } else {
//            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
//        }
        return "入库成功";
    }

    @Override
    @Transactional
    public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {

        if (Cools.isEmpty(param)) {
@@ -1102,7 +1174,7 @@
                    wrkDetl.setManu(obj.getRollType()); // 管芯类型
                    wrkDetl.setSku(obj.getWideInWidth()); // 实测宽幅
                    wrkDetl.setItemNum(obj.getThickness()); // 生箔厚度
                    wrkDetl.setManuDate(obj.getFqTime()); // 分切下料时间
                    wrkDetl.setManuDate(roll.getFqTime()); // 分切下料时间
                    wrkDetl.setWeight(roll.getNetWeight()); // 净重
                    wrkDetl.setVolume(roll.getGrossWeight()); // 毛重
                    wrkDetl.setLength(roll.getLength()); // 长度