#

18516761980

2022-09-26 6ce9b97d8103b8b3120ad30fd05d36b4236f9a9d

#

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

@@ -238,6 +238,23 @@
        map.put("isComplete",true);
        return R.ok(map);
    }
    @PostMapping("/rcp/pakOut/auth/v1")
    @AppAuth(memo = "出库通知单接口调用")
    public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) CombParam param,
                                   HttpServletRequest request){

        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        //出库开始
        openService.combPackOut(param);

        Map<String,Boolean> map=new HashMap<>();
        map.put("isComplete",true);
        return R.ok(map);
    }

    @PostMapping("/rpv/infoReview/auth/v1")
    @AppAuth(memo = "测试条码信息复核请求")

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

@@ -59,5 +59,9 @@
     * pda测试完成
     */
    Boolean testFinish(Review review);
    /**
     * 出库通知单
     */
    void combPackOut(CombParam param);

}

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

@@ -20,6 +20,8 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.DetlDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
@@ -65,9 +67,12 @@
    private TestMastService testMastService;
    @Autowired
    private LocMastService locMastService;

    @Autowired
    private CommonService commonService;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private WrkMastService wrkMastService;

    @Value("${mes.url}")
    private String mesUrl;
@@ -621,6 +626,99 @@
            throw new CoolException("保存入库通知档失败");
        }
    }
    @Override
    @Transactional
    public void combPackOut(CombParam param) {
        if (Cools.isEmpty(param.getPackNo())) {
            throw new CoolException(BaseRes.PARAM);
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
//                .eq("fire_status", 0)
//                .eq("loc_sts", "F")
                .eq("barcode", param.getPackNo()));
        if (Cools.isEmpty(locMast)){
            throw new CoolException("未查询到PACK码为："+param.getPackNo()+"的货物");
        }else if (locMast.getLocSts().equals("F")){
            throw new CoolException("PACK码为："+param.getPackNo()+"的货物库位状态不是“F”");
        }else if (locMast.getFireStatus()!=0){
            throw new CoolException("警告！！！PACK码为："+param.getPackNo()+"的库位："+locMast.getLocNo()+"消防状态异常！！！");
//        }else if (locMast.getFireStatus()!=0){
//            throw new CoolException("警告！！！PACK码为："+param.getPackNo()+"的库位："+locMast.getLocNo()+"消防状态异常！！！");
//        }else if (locMast.getFireStatus()!=0){
//            throw new CoolException("警告！！！PACK码为："+param.getPackNo()+"的库位："+locMast.getLocNo()+"消防状态异常！！！");
//        }else if (locMast.getFireStatus()!=0){
//            throw new CoolException("警告！！！PACK码为："+param.getPackNo()+"的库位："+locMast.getLocNo()+"消防状态异常！！！");
        }else {
            Date now = new Date();
            Integer ioType = 101;   //入出库类型
            LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
            if (Cools.isEmpty(locDetl)){
                log.error("库位:"+locMast.getLocNo()+"没有明细");
//            } else if (Cools.isEmpty(locDetl.getDeadWarn())){
//                log.error("库位:"+locMast.getLocNo()+"没有静置时间");
//            } else if (Cools.isEmpty(locMast.getModiTime())){
//                log.error("库位:"+locMast.getLocNo()+"modiTime为空");
            } else if (Cools.isEmpty(locMast.getBarcode())){
                log.error("库位:"+locMast.getLocNo()+"Pack码为空");
            } else {
                // 生成工作号
                int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
                // 生成工作档
                WrkMast wrkMast = new WrkMast();
                wrkMast.setWrkNo(workNo);
                wrkMast.setIoTime(now);
                wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
                wrkMast.setIoType(ioType); // 入出库状态
                wrkMast.setIoPri(13D); // 优先级：13
                wrkMast.setCrnNo(1);
                wrkMast.setSourceStaNo(107); // 源站
                wrkMast.setStaNo(104); // 目标站
                wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
                wrkMast.setFullPlt("Y"); // 满板：Y
                wrkMast.setPicking("N"); // 拣料
                wrkMast.setExitMk("N"); // 退出
                wrkMast.setEmptyMk("N"); // 空板
                wrkMast.setLinkMis("N");
                wrkMast.setBarcode(locMast.getBarcode());
                wrkMast.setAppeTime(now);
                wrkMast.setModiTime(now);
                if (!wrkMastService.insert(wrkMast)) {
                    throw new CoolException("保存工作档失败，出库库位号："+locMast.getLocNo());
                }
                // 生成工作档明细
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(locDetl);
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(now);
                wrkDetl.setAnfme(1.0); // 数量
                wrkDetl.setAppeTime(now);
                wrkDetl.setModiTime(now);
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }
                // 修改库位状态:   F.在库 ====>>> R.出库预约
                if (locMast.getLocSts().equals("F")) {
                    locMast.setLocSts("R");
                    locMast.setModiTime(now);
//                    locMast.setPackStatus(5); //5:静置完成
//                    CombParam combParam = new CombParam();
//                    combParam.setPackNo(locMast.getBarcode());
//                    combParam.setLocno(locMast.getLocNo());
//                    combParam.setPackSts(6);
//                    combParam.setRequestTime(DateUtils.convert(new Date()));
//                    postMesData(inpath,combParam);

                    if (!locMastService.updateById(locMast)) {
                        throw new CoolException("预约库位状态失败，库位号："+locMast.getLocNo());
                    }
                } else {
                    throw new CoolException(locMast.getLocNo() + "库位不是在库状态");
                }
            }
        }


    }

    @Override
    @Transactional