Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 8caf5f04be94d8f52fb291dd045663079d681c19

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

@@ -6,6 +6,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
* @Description: 齐套性检查记录
@@ -69,6 +71,15 @@
   public Result<String> add(@RequestBody MesKittingCompletenessCheck mesKittingCompletenessCheck) {
       mesKittingCompletenessCheckService.save(mesKittingCompletenessCheck);
       return Result.OK("添加成功！");
   }

   @AutoLog(value = "齐套性检查记录-批量添加")
   @ApiOperation(value="齐套性检查记录-批量添加", notes="齐套性检查记录-批量添加")
   //@RequiresPermissions("org.jeecg.modules:mes_kitting_completeness_check:addBatch")
   @PostMapping(value = "/addBatch")
   public Result<String> addBatch(@RequestBody List<MesKittingCompletenessCheck> mesKittingCompletenessCheckList) {
       mesKittingCompletenessCheckService.batchSave(mesKittingCompletenessCheckList);
       return Result.OK("批量添加成功！");
   }

   /**
@@ -157,5 +168,12 @@
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
       return super.importExcel(request, response, MesKittingCompletenessCheck.class);
   }

   /*
   * 通过 workOrderId 查询齐套信息
   * @param workOrderId
   * */
    @GetMapping("/queryCompletenessCheckByWorkOrderId")
    public Result<?> queryCompletenessCheckByWorkOrderId(@RequestParam(name = "workOrderId", required = true) String workOrderId) {
        return Result.OK(mesKittingCompletenessCheckService.queryCompletenessCheckByWorkOrderId(workOrderId));
    }
}