优化自动移库逻辑及调拨信息上报

zhangc

2025-01-01 6cfcb307f01b9550b6cd67321f2c1db345b4da19

 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;

@Slf4j
@Service("orderService")
@@ -89,6 +90,11 @@
    }

    @Override
    public boolean updateTel(Long orderId, String tel) {
        return this.baseMapper.updateTel(orderId, tel) > 0;
    }

    @Override
    public boolean updateSettle(Long orderId, Long settle, Long userId) {
        return this.baseMapper.updateSettle(orderId, settle, userId) > 0;
    }
@@ -127,15 +133,20 @@

        boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
        if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
            if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMdd))) {
            if (pltType == null) {
                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.yyyyMMddHHmmsssss_F))) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
            }
        } else {
            if (pltType != null && pltType > 0) {
                order.setPltType(pltType);
                order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
                this.baseMapper.updateById(order);
            }
            order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
            super.updateById(order);
            //order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));

        }

@@ -290,6 +301,7 @@
            response = new HttpHandler.Builder()
                    .setUri(url)
                    .setPath(path)
                    .setTimeout(30, TimeUnit.SECONDS)
                    .setJson(JSONObject.toJSONString(requestParam))
                    .build()
                    .doPost();