no message

skyouc

4 天以前 5d7d46792e0a2070c3044c3e961583261da3e6f0

no message

 src/main/java/com/zy/api/enums/OrderWkType.java

@@ -11,6 +11,7 @@
    ORDER_WK_BAG_IN("5", "索赔入库"),
    ORDER_WK_SUPLUS_IN("7", "报溢入库"),
    ORDER_WK_PRO_UPDATE_IN("8", "件号变更入库"),
    ORDER_WK_PRO_LIXIANG_IN("8", "逆向上架入库"),
    ORDER_WK_MEGER_IN("K", "组合拆零入库"),
    ORDER_WK_MOVE_IN("Y", "移库位入库"),
    ORDER_WK_ORDER_OUT_EO("11", "备货指示派工单（EO）"),
@@ -29,6 +30,7 @@
        if (val.equals(OrderWkType.ORDER_WK_PUR_IN.val)
                || val.equals(OrderWkType.ORDER_WK_SUPLUS_IN.val)
                || val.equals(OrderWkType.ORDER_WK_MEGER_IN.val)
                || val.equals(OrderWkType.ORDER_WK_PRO_LIXIANG_IN.val)
                || val.equals(OrderWkType.ORDER_WK_PRO_UPDATE_IN.val)
                || val.equals(OrderWkType.ORDER_WK_MOVE_IN.val)) {
            return OrderType.ORDER_IN.type;

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

@@ -30,6 +30,7 @@
import com.zy.asrs.service.impl.BasAreasServiceImpl;
import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
import com.zy.asrs.service.impl.OrderPakinServiceImpl;
import com.zy.asrs.service.impl.OrderPakoutServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -73,6 +74,10 @@
    private OrderPakinService orderPakinService;
    @Autowired
    private OrderDetlPakinService orderDetlPakinService;
    @Autowired
    private OrderPakoutService orderPakoutService;
    @Autowired
    private OrderDetlPakoutService orderDetlPakoutService;


    /**
@@ -371,22 +376,43 @@
            /** 不存在，新增订单 */
            generateOrders(params, type);
        } else {
            OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", order.getOrderNo()));
            if (!Objects.isNull(orderPakin) && orderPakin.getSettle() != 1) {
                throw new CoolException("订单已处理，不可再变更！！");
            }
            /** 存在，删除老订单，更新插入新订单 */
            if (!orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", orderPakin.getOrderNo()))) {
                throw new CoolException("订单删除失败！！");
            }
            if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
                // 入库
                OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", order.getOrderNo()));
                if (!Objects.isNull(orderPakin) && orderPakin.getSettle() != 1) {
                    throw new CoolException("订单已处理，不可再变更！！");
                }
                /** 存在，删除老订单，更新插入新订单 */
                if (!orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", orderPakin.getOrderNo()))) {
                    throw new CoolException("订单删除失败！！");
                }

            if (!orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderPakin.getOrderNo()))) {
                throw new CoolException("主单删除失败！！");
                if (!orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderPakin.getOrderNo()))) {
                    throw new CoolException("主单删除失败！！");
                }
            } else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
                // 出库
               if (OrderWkType.ORDER_WK_ORDER_OUT_EO.val.equals(params.getType())
                        || OrderWkType.ORDER_WK_ORDER_OUT_SO.val.equals(params.getType()) ||
                        OrderWkType.ORDER_WK_ORDER_OUT.val.equals(params.getType())) {
                    // 备货指示派工单（EO/SO）出库
                   OrderPakout orderPakin = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("order_no", order.getOrderNo()));
                   if (!Objects.isNull(orderPakin) && orderPakin.getSettle() != 1) {
                       throw new CoolException("订单已处理，不可再变更！！");
                   }

                   /** 存在，删除老订单，更新插入新订单 */
                   if (!orderPakoutService.delete(new EntityWrapper<OrderPakout>().eq("order_no", orderPakin.getOrderNo()))) {
                       throw new CoolException("订单删除失败！！");
                   }

                   if (!orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderPakin.getOrderNo()))) {
                       throw new CoolException("主单删除失败！！");
                   }
                } else {
                    throw new CoolException("单据类型不存在，不支持添加！！");
                }
            }
            // 删除旧订单明细
//            if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
//                throw new CoolException("订单明细删除失败！！");
//            }

            order.setSettle(3L);
            if (!orderService.updateById(order)) {
@@ -878,9 +904,9 @@
            checkOrderDetl.setStatus(1);
            checkOrderDetl.setZpallet(locDetl.getZpallet());
            checkOrderDetl.setCreateBy(userId);
            checkOrderDetl.setCreateTime(new Date());
//            checkOrderDetl.setCreateTime(new Date());
            checkOrderDetl.setUpdateBy(userId);
            checkOrderDetl.setUpdateTime(new Date());
//            checkOrderDetl.setUpdateTime(new Date());

            if (!checkOrderDetlService.insert(checkOrderDetl)) {
                throw new CoolException("保存盘点单明细失败");

 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,12 +190,43 @@
        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);
                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 (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) {
                //TODO 恢复正常后，这里代码要注释掉
//                if (mast.getWrkSts() != 14) {
                if (mast.getWrkSts() != 14) {
                    //TODO 恢复正常后，这里代码要注释掉
//                    if (mast.getIoType() == 103) {
//                    if (mast.getIoType() == 103  || mast.getIoType() == 107) {
//                        List<WrkDetl> wrkDetls103 = wrkDetlService
//                                .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
//                        if (wrkDetls103.isEmpty()) {
@@ -225,8 +256,7 @@
//                            }
//                        }
//                    }
//                    mast.setWrkSts(14L);
//                }
                }
                mast.setWrkSts(14L);
            }
            if (!wrkMastService.updateById(mast)) {
@@ -307,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)) {
@@ -330,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 {
@@ -355,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 {
@@ -380,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("暂无可用库位！！");