Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

zjj

2024-05-30 a83eeabe948a953290062e5dcedb0d33f01defef

Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

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

@@ -591,6 +591,7 @@
        } else {
            throw new CoolException("当前工作状态无法取消");
        }

        // 订单关联
        List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
        for (WrkDetl wrkDetl : wrkDetls) {
@@ -598,6 +599,30 @@
                if (!orderDetlService.decrease(wrkDetl.getOrderNo(), hostId, wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
                    throw new CoolException("订单数据回滚失败");
                }

                //修改订单主表状态,没有作业数量时才可以修改
                boolean flag = true;
                List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
                        .eq(OrderDetl::getOrderNo, wrkDetl.getOrderNo())
                        .eq(OrderDetl::getHostId, hostId));
                for(OrderDetl orderDetl : orderDetls){
                    if(orderDetl.getWorkQty() > 0){
                        flag = false;
                    }
                }
                if(flag){
                    Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
                            .eq(Order::getOrderNo, wrkDetl.getOrderNo())
                            .eq(Order::getHostId, hostId));
                    if(!Cools.isEmpty(order) && order.getSettle()==2){
                        order.setSettle(1L);
                        order.setUpdateBy(userId);
                        order.setUpdateTime(new Date());
                    }
                    if(!orderService.updateById(order)){
                        throw new CoolException("修改订单状态失败");
                    }
                }
            }
        }
        // 取消操作人员记录

 zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml

@@ -87,7 +87,7 @@

    <update id="decrease">
        update wms_order_detl
        set qty = qty - #{qty}
        set work_qty = work_qty - #{qty}
        where 1=1
        and order_no = #{orderNo}
        and matnr = #{matnr}

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

@@ -381,6 +381,7 @@
            matParam.setOrderNo(orderDetl.getOrderNo());
            matParam.setOrderId(orderDetl.getOrderId());
            matParam.setCount(count);
            matParam.setUseCount(0D);
            maps.add(matParam);
        }
        return R.ok().add(maps);