兼容四期

zhangc

2025-02-11 3fbde4dd7e79fdb11f1fd140de0d5ada1f16d04d

兼容四期

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

@@ -880,7 +880,7 @@
            if (newLocMast.getLev1() == 1 && !factory.equals(AsrsConstants.SANCHANG)) {
                agvWrkMast.setCtnNo("1");
            } else if (newLocMast.getLev1() == 2 && !factory.equals(AsrsConstants.ERCHANG)) {
                agvWrkMast.setCtnNo("1");
                agvWrkMast.setCtnNo("2");
            }
        }
        if (!agvWrkMastService.update(agvWrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", agvWrkMast.getWrkNo()))) {

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

@@ -108,6 +108,9 @@
    @Override
    public void checkComplete(String orderNo, Integer pltType) {
        Order order = this.selectByNo(orderNo);
        if (order.getDocType() == 38) {
            return;
        }
        if (Cools.isEmpty(order)) {
            return;
        }
@@ -154,6 +157,9 @@
    @Transactional
    public void checkComplete2(String orderNo) {
        Order order = this.selectByNo(orderNo);
        if (order.getDocType() == 38) {
            return;
        }
        if (Cools.isEmpty(order)) {
            return;
        }

 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java

@@ -218,9 +218,7 @@
        // 查询 不为1楼的空货架
        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>()
                // TODO 四期
                .eq("loc_sts", "D").eq("loc_type1", 3)
                .andNew()
                .ne("floor", 1).or().ne("lev1", 1));
                .eq("loc_sts", "D").eq("loc_type1", 3).andNew().ne("floor", 1).or().ne("lev1", 1));
        if (agvLocMasts.isEmpty()) {
            return;
        }
@@ -415,16 +413,25 @@
                    return;
                }

                List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("floor", 1).eq("loc_sts", "F").eq("loc_type1", 3).eq("ctn_no", "1"));
                List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("floor", 1).eq("loc_sts", "F").eq("loc_type1", 3).isNotNull("ctn_no"));
                if (agvLocMasts.isEmpty()) {
                    return;
                }
                for (AgvLocMast agvLocMast : agvLocMasts) {
                    if (agvLocMast.getLev1() == 1 && !Cools.isEmpty(agvLocMast.getCtnNo()) && agvLocMast.getCtnNo().toString().equals("2")) {
                    try {
                        autoMoveHandler.autoTransfersV2(agvLocMast, maxTansk);
                    } catch (Exception e) {
                        log.error("库位号" + agvLocMast.getLocNo() + "四期定时移库任务 吸塑 --> 吸塑,处理失败：===》异常原因：" + e.getMessage());
                    }
                    } else if (agvLocMast.getLev1() == 2 && !Cools.isEmpty(agvLocMast.getCtnNo()) && agvLocMast.getCtnNo().toString().equals("1")) {
                        try {
                            autoMoveHandler.autoTransfersV2(agvLocMast, maxTansk);
                        } catch (Exception e) {
                            log.error("库位号" + agvLocMast.getLocNo() + "四期定时移库任务 吸塑 --> 吸塑,处理失败：===》异常原因：" + e.getMessage());
                        }
                    }

                }
            }
        }

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -3,10 +3,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -345,12 +345,12 @@
        <include refid="pakOutPageCondition"></include>
    </select>

    <select id="getReportDetl" resultMap="BaseResultMap">
    <select id="getReportDetl" resultType="String">
        select DISTINCT o.order_no
        from man_order_detl d
                 join man_order o on d.id = d.order_id
                 join man_order o on o.id = d.order_id
        where o.doc_type = #{docType}
          and d.qty > d.report_qty
          and d.qty > ISNULL(d.report_qty, 0)
          and d.qty > 0
    </select>