自动化立体仓库 - WMS系统
zhangc
2024-12-22 79837ea72054fb14290e8c356ea09c9aa8d5f8ee
优化订单同步逻辑及时间格式处理
3个文件已修改
16 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/OrderMapper.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -137,14 +137,14 @@
                if (!this.updateSettle(order.getId(), 4L, 9528L)) {
                    throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
                }
            } else if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F))) {
            } else if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F))) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
            }
        } else {
            if (pltType != null && pltType > 0) {
                order.setPltType(pltType);
                order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
                super.updateById(order);
                order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
                this.baseMapper.updateById(order);
            }
            //order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,6 +1,5 @@
package com.zy.asrs.task;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.AgvLocDetl;
@@ -19,7 +18,6 @@
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.stream.Collectors;
/**
 * Created by vincent on 2020/7/7
@@ -102,7 +100,9 @@
    public void completeOrder() {
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
        orderList.forEach(order -> {
            orderService.checkComplete(order.getOrderNo(), null);
            if (order.getPltType() != null) {
                orderService.checkComplete(order.getOrderNo(), order.getPltType());
            }
        });
    }
src/main/resources/mapper/OrderMapper.xml
@@ -64,9 +64,7 @@
        update man_order
        set settle = #{settle}
        ,update_time = getdate()
        <if test="plt != null">
            ,plt_type = #{plt}
        </if>
        ,plt_type = #{plt}
        ,in_time = #{inTime}
        where 1=1
        and id = #{orderId}