#

1

3 天以前 4881f66b288c535c3b9da41ee07c9609bacb8481

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

@@ -872,7 +872,7 @@
            agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoSou.getAgvLocNo());
            agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
            agvBindCtnrAndBinParam.setIndBind("1");
            ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV容器解绑",
            ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV容器绑定",
                    AgvConstant.AGV_URL+"/"+AgvConstant.AGV_1LBind,AgvConstant.getAGVADAPTOR(1), agvBindCtnrAndBinParam);
            if(resultBind.getCode() != 200){
                throw new CoolException("agv入库绑定失败");
@@ -888,7 +888,8 @@

    @Override
    @Transactional
    public void combAuto(CombParam param, Long userId) {
    public void
    combAuto(CombParam param, Long userId) {
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
@@ -916,13 +917,26 @@
        }

        Date now = new Date();

        boolean result = false;
        String orderNo = null;
        String orderNo1 = null;
        for (CombParam.CombMat combMat : param.getCombMats()) {
            if(combMat.getSupplier().equals("1")){
                List<OrderDetlPakin> orderDetlPakins2 = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
                        .eq("matnr", combMat.getMatnr()).eq("box_type3", combMat.getOrderNo())
                        .eq("box_type2","BU-00001"));
                if (orderDetlPakins2.size() > 0) {
                    orderNo1 = orderDetlPakins2.get(0).getOrderNo();
                } else {
                    throw new CoolException("未查询到相关订单===>>" + param.getBarcode());
                }
                result = true;
            }
            //0
            List<OrderDetlPakin> orderDetlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
                    .eq("matnr", combMat.getMatnr()).eq("box_type3", combMat.getOrderNo())
                    .eq("standby1", combMat.getStandby1()).eq("standby2", combMat.getStandby2())
                    .eq("standby3", combMat.getStandby3()));
                    .eq("standby3", combMat.getStandby3()).eq("box_type2","shyucheng.test"));
            if (orderDetlPakins.size() > 0) {
                orderNo = orderDetlPakins.get(0).getOrderNo();
                combMat.setBoxType1(orderDetlPakins.get(0).getBoxType1());
@@ -944,10 +958,18 @@
        if (Cools.isEmpty(order) || order.getSettle() > 2) {
            throw new CoolException("单据编号已过期");
        }
        Order order1 = orderService.selectByNo(orderNo);
        if (Cools.isEmpty(order1) || order1.getSettle() > 2) {
            throw new CoolException("单据编号已过期");
        }
        if(result){
            order1.setPayType(1);//  y->h
            order1.setSalesman(orderNo1);
            orderService.updateById(order1);
        }
        // 生成入库通知档
        List<DetlDto> detlDtos = new ArrayList<>();
        param.getCombMats().forEach(elem -> {

            // 订单明细数量校验
//                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
            OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),