Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master int...

skyouc

2025-06-20 625c1058066a01d4d6c2f058d2a4cb1211a80576

Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

# Conflicts:
#	zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java

@@ -117,8 +117,8 @@
    /**

     * 生成自动盘点任务

     */

    @Scheduled(cron = "0/50 * * * * ?")

    @Transactional(rollbackFor = Exception.class)

//    @Scheduled(cron = "0/50 * * * * ?")

//    @Transactional(rollbackFor = Exception.class)

    public void genCheckTask() {

        Loc locs = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocStsId, LocStsType.F.val()).orderByAsc(Loc::getLocNo).last("limit 1"));

        if (Objects.isNull(locs)) {


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

@@ -151,7 +151,7 @@
            return R.parse(CodeRes.USER_10003);

        }

        String system = null;//登陆系统

        if (wms) {

        if (Objects.isNull(wms) || wms) {

            system = String.valueOf(LoginSystemType.WMS);

        }else {

            system = String.valueOf(LoginSystemType.WCS);


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Loc.java

@@ -103,6 +103,7 @@
     * 是否删除 1: 是  0: 否  

     */

    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")

    @TableLogic

    private Integer deleted;



    /**


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java

@@ -187,7 +187,7 @@
    public Double getWaitQty(){

        Double qty = 0D;

        WaitPakinService service = SpringUtils.getBean(WaitPakinService.class);

        List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id).eq(WaitPakin::getIoStatus, 0));

        List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id));

        for (WaitPakin waitPakin : waitPakins) {

            qty += waitPakin.getAnfme();

        }


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java

@@ -468,6 +468,7 @@
            }

            OrderDetlLog orderDetlLog = new OrderDetlLog();

            BeanUtils.copyProperties(byId, orderDetlLog);

            orderDetlLog.setId(null);

            orderDetlLog.setQty(order.getWorkQty());

            orderDetlLog.setWorkQty(0.0);

            if (!orderDetlLogService.save(orderDetlLog)) {

@@ -511,6 +512,7 @@
        orderList.forEach(one -> {

            OrderLog orderLog = new OrderLog();

            BeanUtils.copyProperties(one, orderLog);

            orderLog.setId(null);

            orderLog.setOrderSettle(OrderSettleType.COMPLETE.val());



            if (!orderLogService.save(orderLog)) {