#拣货单完成、上架规则

zjj

2023-09-06 914a092bc4c21d69641f94b68fecf61b25ddaca1

 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;
@@ -30,10 +31,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.math.BigDecimal;
import java.util.*;

/**
 * 移动端服务核心类
@@ -81,6 +80,9 @@
    private ManLocDetlService manLocDetlService;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WaitPakinLogService waitPakinLogService;



    @Override
@@ -120,12 +122,7 @@
                combMat.setBatch("");
            }
        }




        Date now = new Date();

        // 无单组托
        if (Cools.isEmpty(param.getOrderNo())) {

@@ -171,25 +168,31 @@
        // 关联组托
        } else {
            for (CombParam.CombMat combMat : param.getCombMats()) {
                Integer sum = orderDetlService.sameOrderComb(param.getOrderNo(), combMat.getMatnr(),combMat.getBatch());
                OrderDetl orderDetl = orderDetlService.selectItem(param.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
                OrderDetl orderDetl = orderDetlService.selectItem(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
                if (orderDetl == null) {
                    throw new CoolException("找不到组托的单据明细");

                }
                Double anfme = orderDetl.getAnfme();
                Double workQty = orderDetl.getWorkQty();
                if ( anfme - (workQty+sum) < 0) {
                BigDecimal a1 = new BigDecimal(orderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
                BigDecimal b1 = new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
                BigDecimal c1 = new BigDecimal(combMat.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
                double e1 = b1.add(c1).doubleValue();
                BigDecimal f1 = new BigDecimal(e1).setScale(2,BigDecimal.ROUND_HALF_UP);
                Double d1 = a1.subtract(f1).doubleValue();
                if ( d1 < 0.0) {
                    throw new CoolException("组托数量已超出订单需求量，请检查是否有其他的组托已完成");
                }
            }
            Order order = orderService.selectByNo(param.getOrderNo());
            if (order.getSettle() > 2) {
                throw new CoolException("单据编号已过期");
            }

            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            for (CombParam.CombMat elem : param.getCombMats()) {
                Order order = orderService.selectByNo(elem.getOrderNo());
                if (order.getSettle() > 2) {
                    throw new CoolException("单据编号已过期");
                }
                // 订单明细数量校验
                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
                if(orderDetl == null){
@@ -213,7 +216,10 @@
                    detlDtos.add(detlDto);
                }
            }
            int i=0;
            for (DetlDto detlDto : detlDtos) {
                Order order = orderService.selectByNo(param.getCombMats().get(i).getOrderNo());
                i++;
                String uuid = String.valueOf(System.currentTimeMillis());
                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                if (Cools.isEmpty(mat)) {
@@ -221,7 +227,7 @@
                }
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.sync(mat);
                waitPakin.setOrderNo(order.getOrderNo());   // 单据编号
                waitPakin.setOrderNo(order.getOrderNo()); // 单据编号
                waitPakin.setBatch(detlDto.getBatch());     // 序列码
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
@@ -238,8 +244,9 @@
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
                orderService.updateSettle(order.getId(), 2L, userId);
            }
            orderService.updateSettle(order.getId(), 2L, userId);

        }

    }
@@ -523,8 +530,29 @@
    public R manDetlIn(JSONObject json, User user) {
        Date date = new Date();
        String jsonLocNo = (String) json.get("locNo");

        List<ManLocDetl> locDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo));
        Node node = nodeService.selectOne(new EntityWrapper<Node>()
                .eq("name", jsonLocNo));

//        if (node.getParentName().equals("A") || node.getParentName().equals("B")){
//            if (node.getRow1() == 1 && locDetls.size() >=11){
//                return R.error("该库位排已满");
//            }
//            if (node.getRow1() == 6 && locDetls.size() >=4){
//                return R.error("该库位排已满");
//            }
//            if (node.getRow1() == 12 && locDetls.size() >=4){
//                return R.error("该库位排已满");
//            }
//
//        }
//        if (locDetls.size() >=12){
//            return R.error("该库位排已满");
//        }



        JSONArray combMats = json.getJSONArray("combMats");
        for (int i = 0; i < combMats.size(); i++) {
            OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
@@ -569,7 +597,8 @@
                if(!manLocDetlService.insert(manLocDetl)){
                    return R.error("插入平库物料失败！");
                }
            } else {
            }
            else {
                  if (checkManLocDetl.getWeight() == null){
                      checkManLocDetl.setWeight(0.0);
                  }
@@ -643,17 +672,28 @@
            EntityWrapper<ManPakOut> manPakOutEntityWrapper = new EntityWrapper<>();
            manPakOutEntityWrapper.eq("loc_no",jsonLocNo);
            manPakOutEntityWrapper.eq("matnr",jsonOrderDetl.getMatnr());
            manPakOutEntityWrapper.eq("doc_num",order.getOrderNo());
            ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper); //获取拣货单中的对应的订单
            if(Cools.isEmpty(manPakOut)){
                return R.error("没有找到对应的出库单"+jsonLocNo+"-------"+jsonOrderDetl.getMatnr());
            }
            if(manPakOut.getCount() == null){
                manPakOut.setCount(0.0);
            }
//            if (jsonOrderDetl.getAnfme() > manPakOut.getAnfme()) { //判断工作数量是否大于拣货单的数量
//                return R.error("出库数量大于拣货单总数量");
//            }
            if (jsonOrderDetl.getAnfme() > (manPakOut.getAnfme()-manPakOut.getCount())) { //判断工作数量是否大于拣货单剩余可出的数量
            BigDecimal a1 = new BigDecimal(manPakOut.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
            BigDecimal b1 = new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP);
            Double c1 = a1.subtract(b1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
            if (jsonOrderDetl.getAnfme() > c1) { //判断工作数量是否大于拣货单剩余可出的数量
                return R.error("出库数量大于拣货单剩余可出数量");
            }
            if (orderDetl.getWorkQty() - orderDetl.getQty() <jsonOrderDetl.getAnfme() ){

            BigDecimal e1 = new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
            BigDecimal f1 = new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
            Double g1 = e1.subtract(f1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
            if ( g1  <jsonOrderDetl.getAnfme() ){
                return R.error("出库数量大于单据剩余可出数量");
            }
            //查询平库中是否有一样的物料号
@@ -664,8 +704,14 @@
            if (jsonOrderDetl.getAnfme() > checkManLocDetl.getAnfme()) {
                return R.error("出库数量大于可出数量");
            }
            Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
            Double weight = checkManLocDetl.getWeight() - jsonOrderDetl.getWeight();
            if(checkManLocDetl.getWeight() == null){
                checkManLocDetl.setWeight(0.0);
            }
            if(jsonOrderDetl.getWeight() == null){
                jsonOrderDetl.setWeight(0.0);
            }
            Double finalQty =  new BigDecimal(checkManLocDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() ;
            Double weight =  new BigDecimal(checkManLocDetl.getWeight()).setScale(2,BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(jsonOrderDetl.getWeight()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() ;
            checkManLocDetl.setAnfme(finalQty);
            checkManLocDetl.setWeight(weight);
            if (weight < 0){
@@ -680,7 +726,7 @@
                    return R.error("修改平库物料失败！");
                }
            }
            orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
            orderDetl.setQty( new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() );
            orderDetl.setUpdateTime(date);
            orderDetlService.updateById(orderDetl);
            //更新订单状态
@@ -689,7 +735,7 @@
            boolean log=true;
            for (OrderDetl orderDetl1: orderDetls) {
                //工作中的数量小于总订单数时，订单状态改为2，作业中
                if(orderDetl1.getQty() < orderDetl.getAnfme()){
                if(orderDetl1.getQty() < orderDetl1.getAnfme()){
                    log=false;
                }
            }
@@ -702,11 +748,12 @@
            if(manPakOut.getCount() == null){
                manPakOut.setCount(0.0);
            }
            manPakOut.setCount(manPakOut.getCount()+jsonOrderDetl.getAnfme().intValue());

            manPakOut.setCount(new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
            if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
                return R.error("更新拣货单完成数目失败");
            }
            if (manPakOut.getAnfme().intValue() == manPakOut.getCount()){
            if (manPakOut.getAnfme().equals(manPakOut.getCount())){
                manPakOut.setStatus(1);
                if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
                    return R.error("更新拣货单状态失败");
@@ -715,9 +762,7 @@
            EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>();
            manLocDetlEntityWrapper.eq("loc_no",manPakOut.getLocNo());
            manLocDetlEntityWrapper.eq("matnr",manPakOut.getMatnr());
            if (checkManLocDetl.getAnfme().intValue() == manPakOut.getCount()){


            if (checkManLocDetl.getAnfme() == 0 ){
                if(!manLocDetlService.delete(manLocDetlEntityWrapper)){
                    return R.error("删除平库库存失败");
                }
@@ -732,4 +777,107 @@
        }
        return R.ok("下架完成");
    }

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

        List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //获取对应组托信息
        if (Cools.isEmpty(waitPakins)){
            return R.error("未查询到组托");
        } else if (waitPakins.get(0).getIoStatus().equals("Y")) {
            return R.error("组托已经生成工作档");
        }

        for (WaitPakin waitPakin: waitPakins) {
            List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("zpallet", waitPakin.getZpallet()));
            if (!Cools.isEmpty(manLocDetls) || manLocDetls.size()>0){
                return R.error("所在库位已存在明细");
            }
        }
        //判断订单是否完成
        boolean log =true;

        for (WaitPakin waitPakin: waitPakins) {
            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(jsonLocNo);
            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("插入历史入库通知档失败");
            }
            //订单是否完成
            List<OrderDetl> or = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", waitPakin.getOrderNo()));
            for (OrderDetl o: or) {
                if(o.getAnfme()-o.getQty()>0){
                    log=false;
                    break;
                }
            }
            if(log){
                order.setSettle(4L);
                if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no", waitPakin.getOrderNo()))){
                    return R.error("订单转完成状态失败！！！");
                }
            }
        }

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