Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 86565eefc5c2fa9be6a00db58d1079c6d0d908ac

Merge remote-tracking branch 'origin/master'

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

@@ -43,141 +43,141 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
/**
 * @Description: 刀具报废
 * @Author: jeecg-boot
 * @Date:   2025-07-28
 * @Date: 2025-07-28
 * @Version: V1.0
 */
@Api(tags="刀具报废")
@Api(tags = "刀具报废")
@RestController
@RequestMapping("/cms/cuttingScrap")
@Slf4j
public class CuttingScrapController extends JeecgController<CuttingScrap, ICuttingScrapService> {
    @Autowired
    private ICuttingScrapService cuttingScrapService;
    @Autowired
    private ICuttingScrapService cuttingScrapService;

     @Autowired
     private ICuttingScrapDetailService cuttingScrapDetailService;
	
    /**
     * 分页列表查询
     *
     * @param cuttingScrap
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "刀具报废-分页列表查询")
    @ApiOperation(value="刀具报废-分页列表查询", notes="刀具报废-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CuttingScrap>> queryPageList(CuttingScrap cuttingScrap,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<CuttingScrap> queryWrapper = QueryGenerator.initQueryWrapper(cuttingScrap, req.getParameterMap());
        Page<CuttingScrap> page = new Page<CuttingScrap>(pageNo, pageSize);
        IPage<CuttingScrap> pageList = cuttingScrapService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     *   添加
     *
     * @param jSONObject
     * @return
     */
    @AutoLog(value = "刀具报废-添加")
    @ApiOperation(value="刀具报废-添加", notes="刀具报废-添加")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody JSONObject jSONObject) {
        CuttingScrap cuttingScrap = jSONObject.toJavaObject(CuttingScrap.class);
        cuttingScrap.setOrderStatus("1");
        cuttingScrapService.saveOrUpdate(cuttingScrap);
        //删除原关联数据
        List<CuttingScrapDetail> cuttingScrapDetailList = cuttingScrapDetailService.lambdaQuery().eq(CuttingScrapDetail::getOrderId,cuttingScrap.getId()).list();
        cuttingScrapDetailService.removeBatchByIds(cuttingScrapDetailList);
        //添加新关联数据
        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);
            temp.setOrderId(cuttingScrap.getId());
            cuttingScrapDetailService.save(temp);
        }
        return Result.OK("添加成功！");
    }
	
    /**
     *  编辑
     *
     * @param cuttingScrap
     * @return
     */
    @AutoLog(value = "刀具报废-编辑")
    @ApiOperation(value="刀具报废-编辑", notes="刀具报废-编辑")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody CuttingScrap cuttingScrap) {
        cuttingScrapService.updateById(cuttingScrap);
        return Result.OK("编辑成功!");
    }
	
    /**
     *   通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "刀具报废-通过id删除")
    @ApiOperation(value="刀具报废-通过id删除", notes="刀具报废-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        cuttingScrapService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "刀具报废-批量删除")
    @ApiOperation(value="刀具报废-批量删除", notes="刀具报废-批量删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.cuttingScrapService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "刀具报废-通过id查询")
    @ApiOperation(value="刀具报废-通过id查询", notes="刀具报废-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<CuttingScrap> queryById(@RequestParam(name="id",required=true) String id) {
        CuttingScrap cuttingScrap = cuttingScrapService.getById(id);
        if(cuttingScrap==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(cuttingScrap);
    }
    @Autowired
    private ICuttingScrapDetailService cuttingScrapDetailService;

    /**
    * 导出excel
    *
    * @param request
    * @param cuttingScrap
    */
     * 分页列表查询
     *
     * @param cuttingScrap
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "刀具报废-分页列表查询")
    @ApiOperation(value = "刀具报废-分页列表查询", notes = "刀具报废-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CuttingScrap>> queryPageList(CuttingScrap cuttingScrap,
                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                     HttpServletRequest req) {
        QueryWrapper<CuttingScrap> queryWrapper = QueryGenerator.initQueryWrapper(cuttingScrap, req.getParameterMap());
        Page<CuttingScrap> page = new Page<CuttingScrap>(pageNo, pageSize);
        IPage<CuttingScrap> pageList = cuttingScrapService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * 添加
     *
     * @param jSONObject
     * @return
     */
    @AutoLog(value = "刀具报废-添加")
    @ApiOperation(value = "刀具报废-添加", notes = "刀具报废-添加")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody JSONObject jSONObject) {
        CuttingScrap cuttingScrap = jSONObject.toJavaObject(CuttingScrap.class);
        cuttingScrap.setOrderStatus("1");
        cuttingScrapService.saveOrUpdate(cuttingScrap);
        //删除原关联数据
        List<CuttingScrapDetail> cuttingScrapDetailList = cuttingScrapDetailService.lambdaQuery().eq(CuttingScrapDetail::getOrderId, cuttingScrap.getId()).list();
        cuttingScrapDetailService.removeBatchByIds(cuttingScrapDetailList);
        //添加新关联数据
        JSONArray jsonArray = jSONObject.getJSONArray("detailData");
        List<CuttingScrapDetail> list = jsonArray.toJavaList(CuttingScrapDetail.class);

        for (CuttingScrapDetail temp : list) {
            temp.setOrderId(cuttingScrap.getId());
            cuttingScrapDetailService.save(temp);
        }
        return Result.OK("添加成功！");
    }

    /**
     * 编辑
     *
     * @param cuttingScrap
     * @return
     */
    @AutoLog(value = "刀具报废-编辑")
    @ApiOperation(value = "刀具报废-编辑", notes = "刀具报废-编辑")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody CuttingScrap cuttingScrap) {
        cuttingScrapService.updateById(cuttingScrap);
        return Result.OK("编辑成功!");
    }

    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "刀具报废-通过id删除")
    @ApiOperation(value = "刀具报废-通过id删除", notes = "刀具报废-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        cuttingScrapService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "刀具报废-批量删除")
    @ApiOperation(value = "刀具报废-批量删除", notes = "刀具报废-批量删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.cuttingScrapService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "刀具报废-通过id查询")
    @ApiOperation(value = "刀具报废-通过id查询", notes = "刀具报废-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<CuttingScrap> queryById(@RequestParam(name = "id", required = true) String id) {
        CuttingScrap cuttingScrap = cuttingScrapService.getById(id);
        if (cuttingScrap == null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(cuttingScrap);
    }

    /**
     * 导出excel
     *
     * @param request
     * @param cuttingScrap
     */
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, CuttingScrap cuttingScrap) {
@@ -185,28 +185,28 @@
    }

    /**
      * 通过excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
     * 通过excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("cms_cutting_scrap:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, CuttingScrap.class);
    }

     /**
      * 根据报废id查询报废明细
      *
      * @param orderId
      * @return
      */
     @GetMapping("/detailList")
     public Result<?> detailList(@RequestParam("orderId") String orderId) {
         List<Map<String, Object>> list = cuttingScrapDetailService.detailList(orderId);
         return Result.ok(list);
     }
    /**
     * 根据报废id查询报废明细
     *
     * @param orderId
     * @return
     */
    @GetMapping("/detailList")
    public Result<?> detailList(@RequestParam("orderId") String orderId) {
        List<Map<String, Object>> list = cuttingScrapDetailService.detailList(orderId);
        return Result.ok(list);
    }

}

 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;
@@ -36,125 +37,125 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
/**
 * @Description: 刀具报废明细
 * @Author: jeecg-boot
 * @Date:   2025-07-28
 * @Date: 2025-07-28
 * @Version: V1.0
 */
@Api(tags="刀具报废明细")
@Api(tags = "刀具报废明细")
@RestController
@RequestMapping("/cms/cuttingScrapDetail")
@Slf4j
public class CuttingScrapDetailController extends JeecgController<CuttingScrapDetail, ICuttingScrapDetailService> {
    @Autowired
    private ICuttingScrapDetailService cuttingScrapDetailService;
	
    /**
     * 分页列表查询
     *
     * @param cuttingScrapDetail
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "刀具报废明细-分页列表查询")
    @ApiOperation(value="刀具报废明细-分页列表查询", notes="刀具报废明细-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CuttingScrapDetail>> queryPageList(CuttingScrapDetail cuttingScrapDetail,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<CuttingScrapDetail> queryWrapper = QueryGenerator.initQueryWrapper(cuttingScrapDetail, req.getParameterMap());
        Page<CuttingScrapDetail> page = new Page<CuttingScrapDetail>(pageNo, pageSize);
        IPage<CuttingScrapDetail> pageList = cuttingScrapDetailService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     *   添加
     *
     * @param cuttingScrapDetail
     * @return
     */
    @AutoLog(value = "刀具报废明细-添加")
    @ApiOperation(value="刀具报废明细-添加", notes="刀具报废明细-添加")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
        cuttingScrapDetailService.save(cuttingScrapDetail);
        return Result.OK("添加成功！");
    }
	
    /**
     *  编辑
     *
     * @param cuttingScrapDetail
     * @return
     */
    @AutoLog(value = "刀具报废明细-编辑")
    @ApiOperation(value="刀具报废明细-编辑", notes="刀具报废明细-编辑")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
        cuttingScrapDetailService.updateById(cuttingScrapDetail);
        return Result.OK("编辑成功!");
    }
	
    /**
     *   通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "刀具报废明细-通过id删除")
    @ApiOperation(value="刀具报废明细-通过id删除", notes="刀具报废明细-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        cuttingScrapDetailService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "刀具报废明细-批量删除")
    @ApiOperation(value="刀具报废明细-批量删除", notes="刀具报废明细-批量删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.cuttingScrapDetailService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "刀具报废明细-通过id查询")
    @ApiOperation(value="刀具报废明细-通过id查询", notes="刀具报废明细-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<CuttingScrapDetail> queryById(@RequestParam(name="id",required=true) String id) {
        CuttingScrapDetail cuttingScrapDetail = cuttingScrapDetailService.getById(id);
        if(cuttingScrapDetail==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(cuttingScrapDetail);
    }
    @Autowired
    private ICuttingScrapDetailService cuttingScrapDetailService;

    /**
    * 导出excel
    *
    * @param request
    * @param cuttingScrapDetail
    */
     * 分页列表查询
     *
     * @param cuttingScrapDetail
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "刀具报废明细-分页列表查询")
    @ApiOperation(value = "刀具报废明细-分页列表查询", notes = "刀具报废明细-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CuttingScrapDetail>> queryPageList(CuttingScrapDetail cuttingScrapDetail,
                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                           HttpServletRequest req) {
        QueryWrapper<CuttingScrapDetail> queryWrapper = QueryGenerator.initQueryWrapper(cuttingScrapDetail, req.getParameterMap());
        Page<CuttingScrapDetail> page = new Page<CuttingScrapDetail>(pageNo, pageSize);
        IPage<CuttingScrapDetail> pageList = cuttingScrapDetailService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * 添加
     *
     * @param cuttingScrapDetail
     * @return
     */
    @AutoLog(value = "刀具报废明细-添加")
    @ApiOperation(value = "刀具报废明细-添加", notes = "刀具报废明细-添加")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
        cuttingScrapDetailService.save(cuttingScrapDetail);
        return Result.OK("添加成功！");
    }

    /**
     * 编辑
     *
     * @param cuttingScrapDetail
     * @return
     */
    @AutoLog(value = "刀具报废明细-编辑")
    @ApiOperation(value = "刀具报废明细-编辑", notes = "刀具报废明细-编辑")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
        cuttingScrapDetailService.updateById(cuttingScrapDetail);
        return Result.OK("编辑成功!");
    }

    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "刀具报废明细-通过id删除")
    @ApiOperation(value = "刀具报废明细-通过id删除", notes = "刀具报废明细-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        cuttingScrapDetailService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "刀具报废明细-批量删除")
    @ApiOperation(value = "刀具报废明细-批量删除", notes = "刀具报废明细-批量删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.cuttingScrapDetailService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "刀具报废明细-通过id查询")
    @ApiOperation(value = "刀具报废明细-通过id查询", notes = "刀具报废明细-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<CuttingScrapDetail> queryById(@RequestParam(name = "id", required = true) String id) {
        CuttingScrapDetail cuttingScrapDetail = cuttingScrapDetailService.getById(id);
        if (cuttingScrapDetail == null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(cuttingScrapDetail);
    }

    /**
     * 导出excel
     *
     * @param request
     * @param cuttingScrapDetail
     */
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, CuttingScrapDetail cuttingScrapDetail) {
@@ -162,12 +163,12 @@
    }

    /**
      * 通过excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
     * 通过excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("cms_cutting_scrap_detail:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

 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>