#supplier逻辑组托

1

1 天以前 6827eba9c63451de02dc0b90451d64c31a06068f

#supplier逻辑组托

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -58,6 +58,8 @@
        //仓库编码
        private String manu = "";

        private String supplier = "";

    }

}

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

@@ -919,21 +919,41 @@

        String orderNo = null;
        for (CombParam.CombMat combMat : param.getCombMats()) {
            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()));
            if (orderDetlPakins.size() > 0) {
                orderNo = orderDetlPakins.get(0).getOrderNo();
                combMat.setBoxType1(orderDetlPakins.get(0).getBoxType1());
                combMat.setBoxType2(orderDetlPakins.get(0).getBoxType2());
                combMat.setBoxType3(orderDetlPakins.get(0).getBoxType3());
                combMat.setMemo(orderDetlPakins.get(0).getMemo());
                combMat.setSupp(orderDetlPakins.get(0).getSupp());
                combMat.setSuppCode(orderDetlPakins.get(0).getSuppCode());
                combMat.setManu(orderDetlPakins.get(0).getManu());//仓库编码
            } else {
                throw new CoolException("未查询到相关订单===>>" + param.getBarcode());
            if(combMat.getSupplier().equals("1")){
                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("box_type2","BU-00001"));//1时检索和得
                if (orderDetlPakins.size() > 0) {
                    orderNo = orderDetlPakins.get(0).getOrderNo();
                    combMat.setBoxType1(orderDetlPakins.get(0).getBoxType1());
                    combMat.setBoxType2(orderDetlPakins.get(0).getBoxType2());
                    combMat.setBoxType3(orderDetlPakins.get(0).getBoxType3());
                    combMat.setMemo(orderDetlPakins.get(0).getMemo());
                    combMat.setSupp(orderDetlPakins.get(0).getSupp());
                    combMat.setSuppCode(orderDetlPakins.get(0).getSuppCode());
                    combMat.setManu(orderDetlPakins.get(0).getManu());//仓库编码
                } else {
                    throw new CoolException("未查询到相关订单===>>" + param.getBarcode());
                }
            }else{
                //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("box_type2","shyucheng.test"));
                if (orderDetlPakins.size() > 0) {
                    orderNo = orderDetlPakins.get(0).getOrderNo();
                    combMat.setBoxType1(orderDetlPakins.get(0).getBoxType1());
                    combMat.setBoxType2(orderDetlPakins.get(0).getBoxType2());
                    combMat.setBoxType3(orderDetlPakins.get(0).getBoxType3());
                    combMat.setMemo(orderDetlPakins.get(0).getMemo());
                    combMat.setSupp(orderDetlPakins.get(0).getSupp());
                    combMat.setSuppCode(orderDetlPakins.get(0).getSuppCode());
                    combMat.setManu(orderDetlPakins.get(0).getManu());//仓库编码
                } else {
                    throw new CoolException("未查询到相关订单===>>" + param.getBarcode());
                }
            }
        }