#订单出库批量出库优化

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;
@@ -24,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;
@@ -80,6 +82,9 @@
    private ManLocDetlService manLocDetlService;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WaitPakinLogService waitPakinLogService;



    @Override
@@ -519,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>()
@@ -572,6 +577,9 @@
                  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(),
@@ -604,7 +612,7 @@
            }
            orderService.checkComplete(order.getOrderNo());

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


@@ -613,7 +621,7 @@

    @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>()
@@ -641,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("出库数量大于拣货单总数量");
@@ -659,6 +667,12 @@
            }
            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();
@@ -696,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)){
@@ -723,9 +737,86 @@
                    return R.error("更新平库库存状态失败");
                }
            }
            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
            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("上架成功");
    }
}