pjb
2025-07-07 d07b83f5e818f838ce6b956e37aaf758fda58419
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
@@ -7,11 +7,8 @@
import com.zy.asrs.wms.asrs.entity.Wave;
import com.zy.asrs.wms.asrs.mapper.OrderNoRuleMapper;
import com.zy.asrs.wms.asrs.entity.OrderNoRule;
import com.zy.asrs.wms.asrs.service.OrderNoRuleService;
import com.zy.asrs.wms.asrs.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.wms.asrs.service.OrderService;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
import com.zy.asrs.wms.asrs.service.WaveService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,6 +29,8 @@
    private OrderTypeService orderTypeService;
    @Autowired
    private WaveService waveService;
    @Autowired
    private CacheSiteService cacheSiteService;
    @Override
    public String getOrderNo(Integer orderType) {
@@ -44,14 +43,13 @@
        StringBuffer buffer = new StringBuffer();
        buffer.append(orderNoRule.getOrderConst());//订单常量
        String pattern = "yyyyMMddHHmmss";
        if (orderNoRule.getTimeRule() == 0) {
            pattern = "yyyyMMdd";
        }
        String pattern = "yyMMddHHmmss";
//        if (orderNoRule.getTimeRule() == 0) {
//            pattern = "yyyyMMdd";
//        }
        SimpleDateFormat format = new SimpleDateFormat(pattern);
        buffer.append(format.format(new Date()));//订单时间
        if(orderType == 1 || orderType == 2) {
            //查当天订单数量