no message

skyouc

4 天以前 5d7d46792e0a2070c3044c3e961583261da3e6f0

 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java

@@ -15,10 +15,7 @@
import com.zy.asrs.entity.param.CompleteParam;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.LocDetlServiceImpl;
import com.zy.asrs.service.impl.MatServiceImpl;
import com.zy.asrs.service.impl.RowLastnoServiceImpl;
import com.zy.asrs.service.impl.WrkDetlServiceImpl;
import com.zy.asrs.service.impl.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
@@ -53,7 +50,11 @@
    @Autowired
    private RowLastnoService rowLastnoService;
    @Autowired
    private OrderDetlPakoutService orderDetlPakoutService ;
    private OrderDetlPakoutService orderDetlPakoutService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;

    /**
     * 通知WCS锁定库位，及禁止当前库位的一切操作
@@ -148,16 +149,15 @@
                    .build()
                    .doPost();
            Map<String, Object> result = JSON.parseObject(response, Map.class);

            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
            wrkMast.setWrkSts(12L);
            if (!wrkMastService.updateById(wrkMast)) {
                throw new CoolException("更新失败！！");
            }
            if (result.get("code").equals(200)) {
                //TODO 上报是否成功
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
                wrkMast.setWrkSts(12L);
                if (!wrkMastService.updateById(wrkMast)) {
                    throw new CoolException("更新失败！！");
                }
            } else {
                throw new CoolException("出库下发任务下发失败！！");
                throw new CoolException("出库下发任务下发失败---------------->" + result.get("msg"));
//                return R.error().add(result);
            }
        } catch (IOException e) {
@@ -190,38 +190,72 @@
        log.info("任务执行参数回写:{}", JSON.toJSONString(params));
        if (params.getMsgType().equals("task_complete") || params.getMsgType().equals("station_out_task_run_complete")) {
            if (mast.getIoType() == 1 || mast.getIoType() == 11 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
                mast.setWrkSts(4L);
            } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
                //TODO 恢复正常后，这里代码要注释掉
                if (mast.getIoType() == 103  || mast.getIoType() == 107) {
                    List<WrkDetl> wrkDetls103 = wrkDetlService
                            .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
                    if (wrkDetls103.isEmpty()) {
                        throw new CoolException("拣料出库 ===>> 更新订单完成数量失败; [workNo=" + mast.getWrkNo());
                    }
                    for (WrkDetl wrkDetl : wrkDetls103) {
                        // 更新订单完成数量
                        OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
                                wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
                                wrkDetl.getStandby2(), wrkDetl.getStandby3(),
                                wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
                        if (orderDetlPakout == null) {
                            orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
                if (params.getMsgType().equals("task_complete")) {
                    if (mast.getIoType() == 53) {
                        List<WrkDetl> wrkDetls103 = wrkDetlService
                                .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
                        if (wrkDetls103.isEmpty()) {
                            throw new CoolException("拣料出库 ===>> 更新订单完成数量失败; [workNo=" + mast.getWrkNo());
                        }
                        for (WrkDetl wrkDetl : wrkDetls103) {
                            // 更新订单完成数量
                            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
                                    wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
                                    wrkDetl.getStandby2(), wrkDetl.getStandby3(),
                                    wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
                        }
                        if (!Cools.isEmpty(orderDetlPakout)) {
                            if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
                                    wrkDetl.getMatnr(),
                                    orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
                                    wrkDetl.getStandby2(), wrkDetl.getStandby3(),
                                    wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
                                    wrkDetl.getAnfme())) {
                                throw new CoolException("全板出库 ===>> 更新订单完成数量失败; [workNo=" + mast.getWrkNo());
                            if (orderDetlPakout == null) {
                                orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
                                        wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
                                        wrkDetl.getStandby2(), wrkDetl.getStandby3(),
                                        wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
                            }
                            if (!Cools.isEmpty(orderDetlPakout)) {
                                if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
                                        wrkDetl.getMatnr(),
                                        orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
                                        wrkDetl.getStandby2(), wrkDetl.getStandby3(),
                                        wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
                                        wrkDetl.getAnfme())) {
                                    throw new CoolException("全板出库 ===>> 更新订单完成数量失败; [workNo=" + mast.getWrkNo());
                                }
                            }
                        }
                    }
                    mast.setWrkSts(4L);
                }
            } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
                if (mast.getWrkSts() != 14) {
                    //TODO 恢复正常后，这里代码要注释掉
//                    if (mast.getIoType() == 103  || mast.getIoType() == 107) {
//                        List<WrkDetl> wrkDetls103 = wrkDetlService
//                                .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
//                        if (wrkDetls103.isEmpty()) {
//                            throw new CoolException("拣料出库 ===>> 更新订单完成数量失败; [workNo=" + mast.getWrkNo());
//                        }
//                        for (WrkDetl wrkDetl : wrkDetls103) {
//                            // 更新订单完成数量
//                            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
//                                    wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
//                                    wrkDetl.getStandby2(), wrkDetl.getStandby3(),
//                                    wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
//                            if (orderDetlPakout == null) {
//                                orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
//                                        wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
//                                        wrkDetl.getStandby2(), wrkDetl.getStandby3(),
//                                        wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
//                            }
//                            if (!Cools.isEmpty(orderDetlPakout)) {
//                                if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
//                                        wrkDetl.getMatnr(),
//                                        orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
//                                        wrkDetl.getStandby2(), wrkDetl.getStandby3(),
//                                        wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
//                                        wrkDetl.getAnfme())) {
//                                    throw new CoolException("全板出库 ===>> 更新订单完成数量失败; [workNo=" + mast.getWrkNo());
//                                }
//                            }
//                        }
//                    }
                }
                mast.setWrkSts(14L);
            }
@@ -303,7 +337,14 @@
        }
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
        if (Objects.isNull(wrkMast)) {
            return R.error("任务档不存在，或已加入历史档");
            WrkMastLog wrkLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>()
                    .eq("loc_no", params.getLocNo())
                    .eq("wrk_no", params.getTaskNo()));

            wrkMast = new WrkMast();
            BeanUtils.copyProperties(wrkLog, wrkMast);

//            return R.error("任务档不存在，或已加入历史档");
        }
        LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
        if (Objects.isNull(locMast)) {
@@ -326,17 +367,33 @@
                if (!Objects.isNull(selectOne)) {
                    Map<String, Object> response = new HashMap<>();
                    response.put("locNo", selectOne.getLocNo());

                    //原库位置空
                    locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
                    locMastService.updateById(locMast);
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
                    locDetls.forEach(locDetl -> {
                        String locNo = locDetl.getLocNo();
                        locDetl.setLocNo(selectOne.getLocNo());
                        if (!locDetlService.update(locDetl, new EntityWrapper<LocDetl>()
                                .eq("loc_no", locNo)
                                .eq("supp_code", locDetl.getSuppCode())
                                .eq("matnr", locDetl.getMatnr()))) {
                            throw new CoolException("库位更新失败！！");
                        }
                    });

                    //新库位预约入库
                    selectOne.setLocSts(LocStsType.LOC_STS_TYPE_S.type);
                    selectOne.setBarcode(locMast.getBarcode());
                    selectOne.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
                    locMastService.updateById(selectOne);

                    wrkMast.setLocNo(selectOne.getLocNo());
                    wrkMast.setWrkSts(2L);
                    wrkMast.setBarcode(locMast.getBarcode());
                    wrkMastService.updateById(wrkMast);


                    //原库位置空
                    locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
                    locMast.setBarcode(null);
                    locMastService.updateById(locMast);

                    return R.ok().add(response);
                } else {
@@ -351,16 +408,33 @@
                    Map<String, Object> response = new HashMap<>();
                    response.put("locNo", selectOne.getLocNo());

                    //原库位置空
                    locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
                    locMastService.updateById(locMast);
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
                    locDetls.forEach(locDetl -> {
                        String locNo = locDetl.getLocNo();
                        locDetl.setLocNo(selectOne.getLocNo());
                        if (!locDetlService.update(locDetl, new EntityWrapper<LocDetl>()
                                .eq("loc_no", locNo)
                                .eq("supp_code", locDetl.getSuppCode())
                                .eq("matnr", locDetl.getMatnr()))) {
                            throw new CoolException("库位更新失败！！");
                        }
                    });

                    //新库位预约入库
                    selectOne.setLocSts(LocStsType.LOC_STS_TYPE_S.type);
                    selectOne.setBarcode(locMast.getBarcode());
                    selectOne.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
                    locMastService.updateById(selectOne);

                    wrkMast.setLocNo(selectOne.getLocNo());
                    wrkMast.setWrkSts(2L);
                    wrkMast.setBarcode(locMast.getBarcode());
                    wrkMastService.updateById(wrkMast);


                    //原库位置空
                    locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
                    locMast.setBarcode(null);
                    locMastService.updateById(locMast);

                    return R.ok().add(response);
                } else {
@@ -376,17 +450,34 @@
                Map<String, Object> response = new HashMap<>();
                response.put("locNo", selectOne.getLocNo());

                //原库位置空
                locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
                locMastService.updateById(locMast);
                List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()));
                locDetls.forEach(locDetl -> {
                    String locNo = locDetl.getLocNo();
                    locDetl.setLocNo(selectOne.getLocNo());
                    if (!locDetlService.update(locDetl, new EntityWrapper<LocDetl>()
                            .eq("loc_no", locNo)
                            .eq("supp_code", locDetl.getSuppCode())
                            .eq("matnr", locDetl.getMatnr()))) {
                        throw new CoolException("库位更新失败！！");
                    }
                });

                //新库位预约入库
                selectOne.setLocSts(LocStsType.LOC_STS_TYPE_S.type);
                selectOne.setBarcode(locMast.getBarcode());
                selectOne.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
                locMastService.updateById(selectOne);

                wrkMast.setLocNo(selectOne.getLocNo());
                wrkMast.setWrkSts(2L);
                wrkMast.setBarcode(locMast.getBarcode());
                wrkMastService.updateById(wrkMast);


                //原库位置空
                locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
                locMast.setBarcode(null);
                locMastService.updateById(locMast);

                return R.ok().add(response);
            } else {
                return R.error("暂无可用库位！！");