#订单出库批量出库优化

zjj

2023-06-28 248f0106cb099a5d6c21b9b7bd648cd0b61a3db0

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

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.*;
import com.core.exception.CoolException;
import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
@@ -15,6 +16,7 @@
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.SaasUtils;
import com.zy.common.CodeRes;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -23,6 +25,7 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -79,6 +82,9 @@
    private ManLocDetlService manLocDetlService;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WaitPakinLogService waitPakinLogService;



    @Override
@@ -94,6 +100,11 @@
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
        }
        try{
            param.setOrderNo(param.getCombMats().get(0).getOrderNo());
        }catch (Exception e){

        }

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
@@ -125,7 +136,7 @@
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;
@@ -156,6 +167,7 @@
                waitPakin.setModiTime(now);
                waitPakin.setOwner(detlDto.getOwner());
                waitPakin.setUuid(uuid);
                waitPakin.setWeight(detlDto.getWeight());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -170,7 +182,8 @@

                }
                Double anfme = orderDetl.getAnfme();
                if ( anfme > (anfme - sum)) {
                Double workQty = orderDetl.getWorkQty();
                if ( anfme - (workQty+sum) < 0) {
                    throw new CoolException("组托数量已超出订单需求量，请检查是否有其他的组托已完成");
                }
            }
@@ -194,7 +207,8 @@
                    throw new CoolException("修改单据作业数量失败");
                }

                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner(),elem.getWeight());
                detlDto.setPayment(orderDetl.getPayment());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;
@@ -222,7 +236,9 @@
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setOwner(detlDto.getOwner());
                waitPakin.setPayment(detlDto.getPayment());
                waitPakin.setUuid(uuid);
                waitPakin.setWeight(detlDto.getWeight());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -245,7 +261,7 @@

        // 获取商品列表
        for(CombParam.CombMat combMat : param.getCombMats()){
            String uuid = String.valueOf(System.currentTimeMillis());

            Mat mat = matService.selectByMatnr(combMat.getMatnr());
            if (Cools.isEmpty(mat)){
                throw new CoolException(combMat.getMatnr() + ":商品档案不存在！");
@@ -264,7 +280,6 @@
            manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
            manLocDetl.setAnfme(combMat.getAnfme());
            manLocDetl.setModiTime(now);
            manLocDetl.setUuid(uuid);
            manLocDetl.setOwner(1);
            if (!manLocDetlService.insert(manLocDetl)) {
                throw new CoolException("商品上架失败！");
@@ -509,7 +524,7 @@

    @Transactional
    @Override
    public R manDetlIn(JSONObject json) {
    public R manDetlIn(JSONObject json, User user) {
        Date date = new Date();
        String jsonLocNo = (String) json.get("locNo");
        Node node = nodeService.selectOne(new EntityWrapper<Node>()
@@ -541,7 +556,7 @@
            //查询平库中是否有一样的物料号，有的话直接增加数量
            ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
            if (checkManLocDetl == null) {
                String uuid = String.valueOf(System.currentTimeMillis());

                ManLocDetl manLocDetl = new ManLocDetl();
                Synchro.Copy(orderDetl, manLocDetl);
                manLocDetl.setLocNo(node.getName());
@@ -552,15 +567,28 @@
                manLocDetl.setModiTime(date);
                manLocDetl.setCreateTime(date);
                manLocDetl.setBatch(jsonOrderDetl.getBatch());
                manLocDetl.setUuid(uuid);
                manLocDetl.setOwner(orderDetl.getOwner());
                manLocDetl.setWeight(jsonOrderDetl.getWeight());
                manLocDetl.setOrderNo(jsonOrderDetl.getOrderNo());
                if(!manLocDetlService.insert(manLocDetl)){
                    return R.error("修改平库物料失败！");
                    return R.error("插入平库物料失败！");
                }
            } else {
                if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(), jsonOrderDetl.getOrderNo(), jsonOrderDetl.getMaktx(), jsonOrderDetl.getBatch())<=0){
                  if (checkManLocDetl.getWeight() == null){
                      checkManLocDetl.setWeight(0.0);
                  }
                  if (jsonOrderDetl.getWeight() == null){
                      jsonOrderDetl.setWeight(0.0);
                  }
                if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
                        node.getName(),
                        jsonOrderDetl.getMatnr(),
                        jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
                        )<=0
                        ){
                    return R.error("修改平库物料失败！");
                }

            }
            orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
            orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
@@ -583,13 +611,17 @@
                return R.error("更新订单状态失败");
            }
            orderService.checkComplete(order.getOrderNo());

            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
        }


        return R.ok("上架完成");
    }

    @Transactional
    @Override
    public R manDetlOut(JSONObject json) {
    public R manDetlOut(JSONObject json,User user) {
        Date date = new Date();
        String jsonLocNo = (String) json.get("locNo");
        Node node = nodeService.selectOne(new EntityWrapper<Node>()
@@ -608,7 +640,7 @@
            if (Cools.isEmpty(node, order)) {
                return R.error("参数为空");
            }
            OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getMaktx());
            OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),"");
            if (Cools.isEmpty(orderDetl)) {
                return R.error("单据明细有误,请检查");
            }
@@ -617,7 +649,7 @@
            manPakOutEntityWrapper.eq("matnr",jsonOrderDetl.getMatnr());
            ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper); //获取拣货单中的对应的订单
            if(manPakOut.getCount() == null){
                manPakOut.setCount(0);
                manPakOut.setCount(0.0);
            }
//            if (jsonOrderDetl.getAnfme() > manPakOut.getAnfme()) { //判断工作数量是否大于拣货单的数量
//                return R.error("出库数量大于拣货单总数量");
@@ -636,13 +668,25 @@
            if (jsonOrderDetl.getAnfme() > checkManLocDetl.getAnfme()) {
                return R.error("出库数量大于可出数量");
            }
            if(checkManLocDetl.getWeight() == null){
                checkManLocDetl.setWeight(0.0);
            }
            if(jsonOrderDetl.getWeight() == null){
                jsonOrderDetl.setWeight(0.0);
            }
            Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
            Double weight = checkManLocDetl.getWeight() - jsonOrderDetl.getWeight();
            checkManLocDetl.setAnfme(finalQty);
            checkManLocDetl.setWeight(weight);
            if (weight < 0){
                return R.error("出库重量有误！");
            }
            if (finalQty < 0){
                //  if(manLocDetlService.deleteDatailed(jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0) {
                return R.error("数量有误！");
                //   }
            }else {
                if(manLocDetlService.increase(finalQty, jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0){
                if(manLocDetlService.increase(finalQty, jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch(),weight)<=0){
                    return R.error("修改平库物料失败！");
                }
            }
@@ -666,7 +710,7 @@
                return R.error("更新订单状态失败");
            }
            if(manPakOut.getCount() == null){
                manPakOut.setCount(0);
                manPakOut.setCount(0.0);
            }
            manPakOut.setCount(manPakOut.getCount()+jsonOrderDetl.getAnfme().intValue());
            if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
@@ -693,8 +737,86 @@
                    return R.error("更新平库库存状态失败");
                }
            }
            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());

        }
        return R.ok("下架完成");
    }

    @Override
    public R manDetlInBarcode(JSONObject json, User user) {
        String jsonLocNo = (String) json.get("locNo"); //获取库位码
        String jsonBarNo = (String) json.get("barcode"); //获取托盘码

        WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //获取对应组托信息
        if (waitPakin.equals(null)){
            return R.error("未查询到组托");
        } else if (waitPakin.getIoStatus() == "Y") {
            return R.error("组托已经生成工作档");
        }
        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", waitPakin.getOrderNo()));  //获取对应订单信息
        if (order.equals(null)){
            return R.error("未查询到订单信息");
        }
        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", waitPakin.
                getOrderNo()).eq("matnr", waitPakin.getMatnr()));  //获取对应订单明细信息
        if (orderDetl.equals(null)){
            return R.error("未查询到订单明细信息");
        }
        Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo));  //获取对应库位信息
        if (node.equals(null)){
            return R.error("未查询到库位信息");
        }
        Date date = new Date();
        ManLocDetl manLocDetl = new ManLocDetl();  //初始化库存实体类
        manLocDetl.setLocNo(node.getName());
        manLocDetl.setNodeId(node.getId());
        manLocDetl.setZpallet(waitPakin.getZpallet());
        manLocDetl.setAnfme(waitPakin.getAnfme());
        manLocDetl.setMatnr(waitPakin.getMatnr());
        manLocDetl.setMaktx(waitPakin.getMaktx());
        manLocDetl.setStatus(1);
        manLocDetl.setCreateBy(user.getId());
        manLocDetl.setCreateTime(date);
        manLocDetl.setUpdateBy(user.getId());
        manLocDetl.setModiTime(date);
        manLocDetl.setOrderNo(waitPakin.getOrderNo());
        manLocDetl.setOwner(waitPakin.getOwner());
        manLocDetl.setPayment(waitPakin.getPayment());

        if (!manLocDetlService.insert(manLocDetl)){  //数据库插入实体类信息
            return R.error("物料信息入库失败");
        }
        orderDetl.setQty(orderDetl.getQty()+ waitPakin.getAnfme());  //更新订单明细数量
        if (!orderDetlService.updateById(orderDetl)){
            return R.error("更新订单明细失败");
        }

        WaitPakinLog waitPakinLog = new WaitPakinLog(); //初始化入库通知单日志实体类
        waitPakinLog.setZpallet(waitPakin.getZpallet());
        waitPakinLog.setAnfme(waitPakin.getAnfme());
        waitPakinLog.setMatnr(waitPakin.getMatnr());
        waitPakinLog.setLocNo(waitPakin.getLocNo());
        waitPakinLog.setMaktx(waitPakin.getMaktx());
        waitPakinLog.setOrderNo(waitPakin.getOrderNo());
        waitPakinLog.setWeight(waitPakin.getWeight());
        waitPakinLog.setStatus("Y");
        waitPakinLog.setIoStatus("Y");
        waitPakinLog.setModiUser(user.getId());
        waitPakinLog.setModiTime(date);
        waitPakinLog.setAppeUser(user.getId());
        waitPakinLog.setAppeTime(date);
        waitPakinLog.setOwner(waitPakin.getOwner());
        waitPakinLog.setPayment(waitPakin.getPayment());
        waitPakinLog.setUuid(waitPakin.getUuid());

        if (!waitPakinLogService.insert(waitPakinLog)){  //插入入库通知历史档数据库
            return R.error("插入历史入库通知档失败");
        }

        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",jsonBarNo))){  //删除原入库通知档
            return R.error("删除入库通知档失败");
        }
        return R.ok("上架成功");
    }
}