订单库口问题修复

skyouc

2025-08-07 f113fba5cf9e2c33a08da704e53d68da25d90e82

订单库口问题修复

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

@@ -11,16 +11,13 @@
import com.zy.asrs.wms.asrs.entity.param.CreateOrderParam;

import com.zy.asrs.wms.asrs.entity.param.UpdateOrderParam;

import com.zy.asrs.wms.asrs.entity.template.OrderTemplate;

import com.zy.asrs.wms.asrs.service.CacheSiteService;

import com.zy.asrs.wms.asrs.service.MatFieldService;

import com.zy.asrs.wms.asrs.service.OrderTypeService;

import com.zy.asrs.wms.asrs.service.*;

import com.zy.asrs.wms.asrs.service.impl.OrderDetlServiceImpl;

import com.zy.asrs.wms.common.annotation.CacheData;

import com.zy.asrs.wms.common.annotation.OperationLog;

import com.zy.asrs.wms.common.domain.BaseParam;

import com.zy.asrs.wms.common.domain.KeyValVo;

import com.zy.asrs.wms.common.domain.PageParam;

import com.zy.asrs.wms.asrs.service.OrderService;

import com.zy.asrs.wms.system.controller.BaseController;

import com.zy.asrs.wms.utils.ExcelUtil;

import com.zy.asrs.wms.utils.Utils;

@@ -47,6 +44,8 @@
    private OrderDetlServiceImpl orderDetlService;

    @Autowired

    private CacheSiteService cacheSiteService;

    @Autowired

    private WaveService waveService;



    @PreAuthorize("hasAuthority('asrs:order:list')")

    @PostMapping("/order/page")

@@ -157,11 +156,11 @@
            Double sum = detls.stream().mapToDouble(OrderDetl::getAnfme).sum();

            order.setWaitQty(sum);

        }



        CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>()

                .eq(CacheSite::getOrderId, order.getId()), false);

        if (!Objects.isNull(cacheSite)) {

            order.setSite(cacheSite.getChannel());

        if (!Objects.isNull(order.getWaveId())) {

            Wave wave = waveService.getById(order.getWaveId());

            if (!Objects.isNull(wave)) {

                order.setSite(wave.getSite());

            }

        }

        return R.ok().add(order);

    }


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

@@ -8,6 +8,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;

import com.zy.asrs.wms.asrs.service.OrderSettleService;

import com.zy.asrs.wms.asrs.service.OrderTypeService;

import com.zy.asrs.wms.asrs.service.WaveService;

import com.zy.asrs.wms.system.entity.Host;

import com.zy.asrs.wms.system.entity.User;

import io.swagger.models.auth.In;

@@ -26,6 +27,7 @@


import java.io.Serializable;

import java.util.Date;

import java.util.Objects;



@Data

@TableName("man_order")

@@ -279,6 +281,18 @@
        return null;

    }



    public String getSite() {

        if (!Cools.isEmpty(this.waveId)){

            WaveService waveService = SpringUtils.getBean(WaveService.class);

            Wave wave = waveService.getById(this.waveId);

            if (!Cools.isEmpty(wave)){

                return wave.getSite();

            }

        }

        return null;

    }





    public String getUpdateTime$(){

        if (Cools.isEmpty(this.updateTime)){

            return "";


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

@@ -60,6 +60,9 @@
    @ApiModelProperty(value= "波次状态 0: 初始化  1: 生成任务  2: 任务播种  3: 完成  ")

    private Integer waveStatus;



    @ApiModelProperty("出库口")

    private String site;



    /**

     * 所属机构

     */


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java

@@ -1110,6 +1110,11 @@
                throw new CoolException("保存工作档失败");

            }



            wave.setSite(operationPort.getFlag());

            if (!waveService.updateById(wave)) {

                throw new CoolException("波次站口状态更新失败！！");

            }



            for (OrderOutMergeDto merge : list) {

                LocDetl locDetl = locDetlService.getById(merge.getLocDetlId());

                if (locDetl == null) {

@@ -1163,6 +1168,8 @@
                throw new CoolException("当前波次订单不存在！！");

            }







//            List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()

//                    .eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).eq(CacheSite::getChannel, task.getTargetSite()));

//


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

@@ -421,7 +421,8 @@
    @Override

    @Transactional(rollbackFor = Exception.class)

    public boolean bindOrderBySite(Map<String, Object> param) {

        CacheSite siteNo = cacheSiteMapper.selectOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, param.get("siteNo")), false);

        CacheSite siteNo = cacheSiteMapper.selectOne(new LambdaQueryWrapper<CacheSite>()

                .eq(CacheSite::getSiteNo, param.get("siteNo")), false);

        if (Objects.isNull(siteNo)) {

            throw new CoolException("站点异常！！");

        }

@@ -429,7 +430,8 @@
            if (!StringUtil.isNullOrEmpty(siteNo.getOrderNo())) {

                throw new CoolException("当前播种站点已绑定订单！！");

            }

            Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, param.get("orderNo").toString()));

            Order order = orderService.getOne(new LambdaQueryWrapper<Order>()

                    .eq(Order::getOrderNo, param.get("orderNo").toString()));

            if (Objects.isNull(order)) {

                throw new CoolException("绑定订单不存在！！");

            }