Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 8caf5f04be94d8f52fb291dd045663079d681c19

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

@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
* @Description: 工单报工
@@ -62,12 +63,12 @@
    * @param mesWorkReporting
    * @return
    */
   @AutoLog(value = "工单报工-添加")
   @ApiOperation(value="工单报工-添加", notes="工单报工-添加")
   @AutoLog(value = "工单报工-新增报工")
   @ApiOperation(value="工单报工-新增报工", notes="工单报工-新增报工")
   //@RequiresPermissions("org.jeecg.modules:mes_work_reporting:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody MesWorkReporting mesWorkReporting) {
       mesWorkReportingService.save(mesWorkReporting);
       mesWorkReportingService.addReporting(mesWorkReporting);
       return Result.OK("添加成功！");
   }

@@ -157,5 +158,22 @@
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
       return super.importExcel(request, response, MesWorkReporting.class);
   }
   /**
    * 根据workOrderId查询 报工
    *
    * @param workOrderId
    * @return
    *
    */
   @GetMapping(value = "/queryWorkReportingByWorkOrderId")
    public Result<?> queryWorkReportingByWorkOrderId(@RequestParam("workOrderId") String workOrderId){
       List<MesWorkReporting> mesWorkReportings = mesWorkReportingService.queryWorkReportingByWorkOrderId(workOrderId);
       return Result.OK(mesWorkReportings);
   }
    @GetMapping(value = "/queryWorkReportingByOrderId")
    public Result<?> queryWorkReportingByOrderId(@RequestParam("orderId") String orderId){
        List<MesWorkReporting> mesWorkReportings = mesWorkReportingService.queryWorkReportingByOrderId(orderId);
        return Result.OK(mesWorkReportings);
    }

}