refactor(cms): 修改了CuttingScrapDetailMapper中的sql已满足前端的需要。

lixiangyu

2 天以前 0736d5caa01efc9e7db504af0589941652d34055

refactor(cms):
修改了CuttingScrapDetailMapper中的sql已满足前端的需要。

 src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java

@@ -102,8 +102,8 @@
        //添加新关联数据
        JSONArray jsonArray = jSONObject.getJSONArray("detailData");
        List<CuttingScrapDetail> list = jsonArray.toJavaList(CuttingScrapDetail.class);
        for (int i = 0; i < list.size(); i++) {
            CuttingScrapDetail temp = list.get(i);

        for (CuttingScrapDetail temp : list) {
            temp.setOrderId(cuttingScrap.getId());
            cuttingScrapDetailService.save(temp);
        }

 src/main/java/org/jeecg/modules/cms/controller/CuttingScrapDetailController.java

@@ -9,6 +9,7 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;

 src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml

@@ -7,11 +7,20 @@
            t1.id,
            t1.order_id orderId,
            t1.cutting_id cuttingId,
            t2.cutting_code cuttingCode,
            t2.cutting_name cuttingName
            t1.inventory_id inventoryId,
            -- t1.workpiece_material workpieceMaterial,
            -- t1.used_life usedLife,
            t2.cutting_barcode cuttingBarcode,
            t2.inventory_status inventoryStatus,
            t2.current_life currentLife,
            t2.id,
            t3.id,
            t3.cutting_code cuttingCode,
            t3.cutting_name cuttingName
        FROM
            cms_cutting_scrap_detail t1
                LEFT JOIN cms_cutting_tool t2 ON t1.cutting_id = t2.id
                LEFT JOIN cms_cutting_inventory t2 ON t1.inventory_id = t2.id
                LEFT JOIN cms_cutting_tool t3 ON t1.cutting_id = t3.id
        WHERE t1.order_id = #{orderId}
    </select>
</mapper>