Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

4 天以前 ac225bd66eb7c21b5af1d8533dc59376ea53da6c

 north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java

@@ -34,14 +34,21 @@
        Object consume =  object.get("consume");
        Object price =  object.get("price");
        Integer type = (Integer) object.get("type");

        String unit="";
        if (type.equals(1)){
            unit = "㎡";
        } else if (type.equals(2)) {
            unit = "m";
        } else if (type.equals(3)) {
            unit = "片";
        }
        if (id!=null){
            //查询物料编号是否已存在
            Integer countId =  bomDataMapper.getMaterialId(id);
            if (countId == 0){
                bomDataMapper.saveMaterialBomDataMp(id,name,consume,price,type);
                bomDataMapper.saveMaterialBomDataMp(id,name,consume,price,type,unit);
            }else {
                bomDataMapper.updateMaterialBomDataMp(id,name,consume,price,type);
                bomDataMapper.updateMaterialBomDataMp(id,name,consume,price,type,unit);
            }

            return true;
@@ -76,17 +83,19 @@
    public Map<String, Object> getOrderBomDataSv(String orderId) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", bomDataMapper.getOrderBomDataMp(orderId));
        map.put("sumData", bomDataMapper.getOrderBomSumDataMp(orderId));
        map.put("sumDataDatils", bomDataMapper.getOrderBomsumDataDatilsMp(orderId));
        return map;
    }

    public Map<String, Object> getBomDataProductSv(Map<String, Object> object) {
        Map<String, Object> map = new HashMap<>();
        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//最终结果
        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
        List<OrderDetail> orderDetailsList = JSONArray.parseArray(JSONObject.toJSONString(object.get("productName")), OrderDetail.class);
        if (!orderDetailsList.isEmpty()) {
            for (OrderDetail od : orderDetailsList) {
                Map<String, Object> itemmap = new HashMap<>();
                itemmap.put("data", bomDataMapper.getBOMDetails(od.getProductId()));
                itemmap.put("data", bomDataMapper.getBOMDetails(od.getProductId(),od.getOrderId()));
                list.add(itemmap);

            }
@@ -94,4 +103,10 @@
        map.put("data", list);
        return map;
    }

    public Map<String, Object> editProductBOMSv(String produceId) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", bomDataMapper.getEditProductBOMSv(produceId));
        return map;
    }
}