#

luxiaotao1123

2022-04-23 b36e97797c72257afd50fb87170fd593df78ecdc

#

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -3,6 +3,8 @@
import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;

import java.util.List;

@@ -16,4 +18,6 @@

    void checkComplete(String orderNo);

    boolean saveHandlerOrder(WrkMast wrkMast, List<WrkDetl> wrkDetls);

}

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

@@ -4,6 +4,8 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.entity.Order;
@@ -61,4 +63,9 @@

    }

    @Override
    public boolean saveHandlerOrder(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
        return false;
    }

}

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

@@ -228,6 +228,7 @@
                if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(detlDto.getLocDetl());
                wrkDetl.setOrderNo(""); // 手动出库不需要带出库存中的单据编号
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(now);
                Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -15,6 +15,9 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Iterator;
import java.util.List;

/**
 * Created by vincent on 2020/7/6
 */
@@ -44,6 +47,19 @@
    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            // 修改订单状态 作业中 ===>> 已完成
            if (!Cools.isEmpty(wrkDetls)) {
                Iterator<WrkDetl> iterator = wrkDetls.iterator();
                while (iterator.hasNext()) {
                    WrkDetl wrkDetl = iterator.next();
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        orderService.checkComplete(wrkDetl.getOrderNo());
                        iterator.remove();
                    }
                }
            }

            // 入库 --------------------------------------------------------------------------------
            if (wrkMast.getWrkSts() == 5) {
                // 全板入库
@@ -59,6 +75,12 @@
                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
                    // 手动入库生成单据 【 上报三方平台 】
                    if (!Cools.isEmpty(wrkDetls)) {
                        if (!orderService.saveHandlerOrder(wrkMast, wrkDetls)) {
                            exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
                // 拣料再入库
                } else if (wrkMast.getIoType() == 53) {

@@ -67,13 +89,6 @@
            // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getWrkSts() == 15) {

            }

            // 修改订单状态 作业中 ===>> 已完成
            for (WrkDetl wrkDetl : wrkDetlService.selectByWrkNo(wrkMast.getWrkNo())) {
                if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                    orderService.checkComplete(wrkDetl.getOrderNo());
                }
            }

            // 保存工作主档历史档