art: 物料拉动业务相关接口添加，物料拉动新增接口，表设计修改

zhangherong

2 天以前 7acd9609e6fd88500f6056165a021b1f6ce0f697

 src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java

@@ -10,8 +10,10 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.mes.entity.MesMaterialTransferRequest;
import org.jeecg.modules.mes.service.IMesMaterialTransferRequestService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -21,149 +23,156 @@
import java.util.Arrays;

/**
* @Description: 物料拉动申请
* @Author: jeecg-boot
* @Date:   2025-07-04
* @Version: V1.0
*/
@Api(tags="物料拉动申请")
 * @Description: 物料拉动申请
 * @Author: jeecg-boot
 * @Date: 2025-07-04
 * @Version: V1.0
 */
@Api(tags = "物料拉动申请")
@RestController
@RequestMapping("/mes/mesMaterialTransferRequest")
@Slf4j
public class MesMaterialTransferRequestController extends JeecgController<MesMaterialTransferRequest, IMesMaterialTransferRequestService> {
   @Autowired
   private IMesMaterialTransferRequestService mesMaterialTransferRequestService;
    @Autowired
    private IMesMaterialTransferRequestService mesMaterialTransferRequestService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;

   /**
    * 分页列表查询
    *
    * @param mesMaterialTransferRequest
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   //@AutoLog(value = "物料拉动申请-分页列表查询")
   @ApiOperation(value="物料拉动申请-分页列表查询", notes="物料拉动申请-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<MesMaterialTransferRequest>> queryPageList(MesMaterialTransferRequest mesMaterialTransferRequest,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                  HttpServletRequest req) {
       QueryWrapper<MesMaterialTransferRequest> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialTransferRequest, req.getParameterMap());
       Page<MesMaterialTransferRequest> page = new Page<MesMaterialTransferRequest>(pageNo, pageSize);
       IPage<MesMaterialTransferRequest> pageList = mesMaterialTransferRequestService.page(page, queryWrapper);
       return Result.OK(pageList);
   }
    /**
     * 分页列表查询
     *
     * @param mesMaterialTransferRequest
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "物料拉动申请-分页列表查询")
    @ApiOperation(value = "物料拉动申请-分页列表查询", notes = "物料拉动申请-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<MesMaterialTransferRequest>> queryPageList(MesMaterialTransferRequest mesMaterialTransferRequest,
                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                   HttpServletRequest req) {
        QueryWrapper<MesMaterialTransferRequest> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialTransferRequest, req.getParameterMap());
        Page<MesMaterialTransferRequest> page = new Page<MesMaterialTransferRequest>(pageNo, pageSize);
        IPage<MesMaterialTransferRequest> pageList = mesMaterialTransferRequestService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

   /**
    *   添加
    *
    * @param mesMaterialTransferRequest
    * @return
    */
   @AutoLog(value = "物料拉动申请-添加")
   @ApiOperation(value="物料拉动申请-添加", notes="物料拉动申请-添加")
   //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody MesMaterialTransferRequest mesMaterialTransferRequest) {
       mesMaterialTransferRequestService.save(mesMaterialTransferRequest);
       return Result.OK("添加成功！");
   }
    /**
     *   添加
     *
     * @param request
     * @return
     */
    @AutoLog(value = "物料拉动申请-添加")
    @ApiOperation(value = "物料拉动申请-添加", notes = "物料拉动申请-添加")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody MesMaterialTransferRequest request) {
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.MATERIAL_TRANSFER_CODE_RULE);
        request.setRequestCode(codeSeq);
        boolean b = mesMaterialTransferRequestService.addMaterialTransferRequest(request);
        if(!b) {
            return Result.error("添加失败！");
        }
        return Result.OK("添加成功！");
    }

   /**
    *  编辑
    *
    * @param mesMaterialTransferRequest
    * @return
    */
   @AutoLog(value = "物料拉动申请-编辑")
   @ApiOperation(value="物料拉动申请-编辑", notes="物料拉动申请-编辑")
   //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody MesMaterialTransferRequest mesMaterialTransferRequest) {
       mesMaterialTransferRequestService.updateById(mesMaterialTransferRequest);
       return Result.OK("编辑成功!");
   }
    /**
     *  编辑
     *
     * @param mesMaterialTransferRequest
     * @return
     */
    @AutoLog(value = "物料拉动申请-编辑")
    @ApiOperation(value = "物料拉动申请-编辑", notes = "物料拉动申请-编辑")
    //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody MesMaterialTransferRequest mesMaterialTransferRequest) {
        mesMaterialTransferRequestService.updateById(mesMaterialTransferRequest);
        return Result.OK("编辑成功!");
    }

   /**
    *   通过id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "物料拉动申请-通过id删除")
   @ApiOperation(value="物料拉动申请-通过id删除", notes="物料拉动申请-通过id删除")
   //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
       mesMaterialTransferRequestService.removeById(id);
       return Result.OK("删除成功!");
   }
    /**
     *   通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "物料拉动申请-通过id删除")
    @ApiOperation(value = "物料拉动申请-通过id删除", notes = "物料拉动申请-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        mesMaterialTransferRequestService.removeById(id);
        return Result.OK("删除成功!");
    }

   /**
    *  批量删除
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "物料拉动申请-批量删除")
   @ApiOperation(value="物料拉动申请-批量删除", notes="物料拉动申请-批量删除")
   //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
       this.mesMaterialTransferRequestService.removeByIds(Arrays.asList(ids.split(",")));
       return Result.OK("批量删除成功!");
   }
    /**
     *  批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "物料拉动申请-批量删除")
    @ApiOperation(value = "物料拉动申请-批量删除", notes = "物料拉动申请-批量删除")
    //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.mesMaterialTransferRequestService.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<MesMaterialTransferRequest> queryById(@RequestParam(name="id",required=true) String id) {
       MesMaterialTransferRequest mesMaterialTransferRequest = mesMaterialTransferRequestService.getById(id);
       if(mesMaterialTransferRequest==null) {
           return Result.error("未找到对应数据");
       }
       return Result.OK(mesMaterialTransferRequest);
   }
    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "物料拉动申请-通过id查询")
    @ApiOperation(value = "物料拉动申请-通过id查询", notes = "物料拉动申请-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<MesMaterialTransferRequest> queryById(@RequestParam(name = "id", required = true) String id) {
        MesMaterialTransferRequest mesMaterialTransferRequest = mesMaterialTransferRequestService.getById(id);
        if (mesMaterialTransferRequest == null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(mesMaterialTransferRequest);
    }

   /**
   * 导出excel
   *
   * @param request
   * @param mesMaterialTransferRequest
   */
   //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, MesMaterialTransferRequest mesMaterialTransferRequest) {
       return super.exportXls(request, mesMaterialTransferRequest, MesMaterialTransferRequest.class, "物料拉动申请");
   }
    /**
     * 导出excel
     *
     * @param request
     * @param mesMaterialTransferRequest
     */
    //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MesMaterialTransferRequest mesMaterialTransferRequest) {
        return super.exportXls(request, mesMaterialTransferRequest, MesMaterialTransferRequest.class, "物料拉动申请");
    }

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

    /*
     * 通过workOrderId 查询mesMaterialTransferRequest数据
     *@param workOrderId
     * */
    @GetMapping(value = "/queryMaterialTransferRequestByWorkOrderId")
    public Result<?> queryMaterialTransferRequestByWorkOrderId(@RequestParam(name="workOrderId",required=true) String workOrderId) {
       return Result.OK(mesMaterialTransferRequestService.queryMaterialTransferRequestByWorkOrderId(workOrderId));
    public Result<?> queryMaterialTransferRequestByWorkOrderId(@RequestParam(name = "workOrderId", required = true) String workOrderId) {
        return Result.OK(mesMaterialTransferRequestService.queryMaterialTransferRequestByWorkOrderId(workOrderId));
    }

}