Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-23 a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d

Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -193,44 +193,6 @@

        return R.ok().add(locDtoList);

        /*
        if (Cools.isEmpty(list)) {
            return R.parse(BaseRes.PARAM);
        }
        Set<String> exist = new HashSet<>();
        List<LocDto> locDtos = new ArrayList<>();

        for (OrderMergeVo vo : list) {
            double issued = Optional.of(vo.getAnfme()).orElse(0.0D);
            if (issued <= 0.0D) { continue; }
            List<LocDetl> locDetls = locDetlService.queryStock(vo.getMatnr(), vo.getBatch(), null, exist);
            for (LocDetl locDetl : locDetls) {
                if (issued > 0) {
                    LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), JSON.toJSONString(vo.getOrderDtos()),
                            issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                    int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
                    List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
                    locDto.setStaNos(staNos);
                    locDtos.add(locDto);
                    exist.add(locDetl.getLocNo());
                    // 剩余待出数量递减
                    issued = issued - locDetl.getAnfme();
                } else {
                    break;
                }
            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null, vo.getMatnr(), vo.getMaktx(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
            }
        }
        for (LocDto locDto : locDtos) {
            Mat mat = matService.selectByMatnr(locDto.getMatnr());
            assert mat != null;
            locDto.setSpecs(mat.getSpecs());
        }
        return R.ok().add(locDtos);*/
    }



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

@@ -82,7 +82,11 @@
                double anfme = agvLocDetl.getAnfme();
                //int ioType = anfme > issued ? 101 : 103;
                anfme = anfme > issued ? issued : anfme;
                LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNo, anfme);
                //用于显示工作明细档的订单号
                String orderNoWrkDtel = Utils.getOrderNo(orderNo,anfme);
                //更新订单数量
                orderNo = Utils.orderMergeUpdate(orderNo,anfme);
                LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNoWrkDtel, anfme);
                locDto.setCsocode(csocode);
                locDto.setIsoseq(isoseq);
                locDto.setContainerCode(agvLocDetl.getSuppCode());
@@ -248,6 +252,4 @@
            }
        }
    }


}

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

@@ -1,6 +1,8 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -563,9 +565,21 @@
        agvWrkDetlList1.forEach(agvWrkDetl -> {

            if(!Cools.isEmpty(agvWrkDetl.getOrderNo())){
                OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(agvWrkDetl.getOrderNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
                orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
                orderDetlService.updateById(orderDetl);
                String orderNo = agvWrkDetl.getOrderNo();
                if(orderNo.contains("{")){
                    JSONArray orderArray = JSON.parseArray(orderNo);
                    for (Object o : orderArray){
                        JSONObject jsonobject = (JSONObject) o;
                        OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
                        orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
                        orderDetlService.updateById(orderDetl);
                    }

                }else {
                    OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(agvWrkDetl.getOrderNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
                    orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
                    orderDetlService.updateById(orderDetl);
                }
            }
        });


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

@@ -101,9 +101,9 @@
        }
        // 如果 作业数量等于单据总数量 && 工作明细档中无该单据的数据 && AGV工作明细档中无该单据的数据
        int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
        boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) < 1;
        boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().eq("order_no",orderNo)) < 1;
        boolean waitPakinExist = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",orderNo)) < 1;
        boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
        boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no",orderNo)) < 1;
        boolean waitPakinExist = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().like("order_no",orderNo)) < 1;

        ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);


 src/main/java/com/zy/asrs/utils/Utils.java

@@ -1,6 +1,8 @@
package com.zy.asrs.utils;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Arith;
@@ -494,4 +496,57 @@
        }
    }

    public static String getOrderNo(String orderNo, double anfme){
        JSONArray orderArray = new JSONArray();
        //如果订单号为jsonString
        if(orderNo.contains("{")){
            JSONArray jsonArray = JSON.parseArray(orderNo);
            //遍历所有订单号及订单数量
            for (Object o : jsonArray){
                JSONObject orderJson = (JSONObject) o;
                Double orderAnfme = orderJson.getDouble("anfme");
                //如果订单数量为0，则跳过
                if(orderAnfme <= 0){
                    continue;
                }
                if(orderAnfme > anfme){
                    //如果订单数量大于该库存数量，且订单数组为空，则直接返回该订单号，否则就将该订单添加到订单数组
                    if(orderArray.isEmpty()){
                        return orderJson.getString("orderNo");
                    }else {
                        orderJson.put("anfme",anfme);
                        orderArray.add(orderJson);
                    }
                }else {
                    anfme -= orderAnfme;
                    orderArray.add(orderJson);
                }
            }
            return orderArray.toJSONString();
        }else {
            return orderNo;
        }

    }

    public static String orderMergeUpdate(String orderNo, double anfme){
        if(orderNo.contains("{")){
            JSONArray jsonArray = JSON.parseArray(orderNo);
            for(int i=0; i<jsonArray.size(); i++){
                JSONObject orderJson = (JSONObject)jsonArray.get(i);
                Double orderAnfme = orderJson.getDouble("anfme");
                if(orderAnfme > anfme){
                    ((JSONObject) jsonArray.get(i)).put("anfme",orderAnfme - anfme);
                    return jsonArray.toJSONString();
                }else {
                    ((JSONObject) jsonArray.get(i)).put("anfme",0);
                    anfme -= orderAnfme;
                }
            }
            return jsonArray.toJSONString();
        }else {
            return orderNo;
        }
    }

}