no message

skyouc

4 天以前 d9fd877179522eac8ebb34da661d1f1efd8ef9b6

no message

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

@@ -193,40 +193,41 @@
                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) {
                        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);
                }
//                    if (mast.getIoType() == 103) {
//                        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);
//                }
                mast.setWrkSts(14L);
            }
            if (!wrkMastService.updateById(mast)) {
                throw new CoolException("任务状态修改失败！！");

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

@@ -361,6 +361,32 @@
    }

    /**
     *
     * 获取捆包出库明细
     * @param params
     * @return
     */
    @ManagerAuth(memo = "获取捆包明细信息")
    @RequestMapping("/agv/bind/info")
    public R getAllBind(@RequestBody AgvCallParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空!!");
        }
        return mobileService.getAllBindInfo(params);
    }

    @ApiOperation("确认捆包出库")
    @ManagerAuth(memo = "确认捆包出库")
    @RequestMapping("/agv/out/confirm")
    public R confirmOutStock(@RequestBody CombParam combParam) {
        if (Objects.isNull(combParam)) {
            return R.error("参数不能为空!!");
        }

        return mobileService.confirmOutstock(combParam);
    }

    /**
     * @author Ryan
     * @date 2025/9/24
     * @description: 呼叫AGV返回

 src/main/java/com/zy/asrs/entity/WaitPakin.java

@@ -13,6 +13,8 @@
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.TagService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -250,6 +252,16 @@
        }
    }

    public String getModiUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
        }
        return null;
    }


    public String getTag$() {
        MatService service = SpringUtils.getBean(MatService.class);
        Mat order = service.selectOne(new EntityWrapper<Mat>()

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

@@ -36,4 +36,7 @@
    @ApiModelProperty("是否新台车入库")
    private List<Integer> isNewIn;

    @ApiModelProperty("任务类型")
    private String taskType;

}

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

@@ -192,4 +192,18 @@
     * @return
     */
    R getCacheSites(String type);

    /**
     * 获取台车捆包明细
     * @param params
     * @return
     */
    R getAllBindInfo(AgvCallParams params);

    /**
     * 确认捆包出库
     * @param combParam
     * @return
     */
    R confirmOutstock(CombParam combParam);
}