电子档案,基础数据日志

liweidong
pangyang 4 weeks ago
parent 2a609f7965
commit ae76e79f0b
  1. 12
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java
  2. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java
  3. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java
  4. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BsAssignController.java
  5. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java
  6. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java
  7. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java
  8. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java
  9. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java
  10. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java
  11. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java
  12. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java
  13. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java
  14. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java
  15. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java
  16. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java
  17. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java
  18. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java
  19. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java
  20. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java
  21. 46
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
  22. 23
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java
  23. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java
  24. 104
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml
  25. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java
  26. 14
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java
  27. 31
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
  28. 18
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RestTemplateConfig.java

@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import org.springblade.desk.quality.pojo.entity.InspectionTask;
import java.io.Serial;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@ -111,4 +112,15 @@ public class InspectionTaskListVO extends InspectionTask {
private String partVersion;
//工单id
private Long yoId;
//完成时间
private LocalDate finishDate;
private String currentProcessCode;
private Long ppsId;
private String ppsCode;
private String ppsName;
}

@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.CommonConstant;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -184,6 +185,7 @@ public class BasicClazzController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("新增基础分类")
@Operation(summary = "新增一条", description = "传入BasicClazz Obj")
public R save(@Valid @RequestBody BasicClazz addOne) {
addOne.setId(null);
@ -195,6 +197,7 @@ public class BasicClazzController extends BladeController {
*/
@PostMapping("/saveBat")
@ApiOperationSupport(order = 31)
@ApiLog("新增基础分类")
@Operation(summary = "新增批量", description = "传入BasicClazz List")
public R saveBat(@Valid @RequestBody List<BasicClazz> addList) {
addList.forEach(one -> {
@ -208,6 +211,7 @@ public class BasicClazzController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("修改基础分类")
@Operation(summary = "修改一条", description = "传入BasicClazz Obj")
public R update(@Valid @RequestBody BasicClazz updateOne) {
return R.status(service.updateById(updateOne));
@ -218,6 +222,7 @@ public class BasicClazzController extends BladeController {
*/
@PostMapping("/updateBat")
@ApiOperationSupport(order = 41)
@ApiLog("修改基础分类")
@Operation(summary = "修改批量", description = "传入BasicClazz List")
public R updateBat(@Valid @RequestBody List<BasicClazz> updateList) {
return R.status(service.updateBatchById(updateList));
@ -248,6 +253,7 @@ public class BasicClazzController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("删除基础分类")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -121,6 +122,7 @@ public class BatConfigController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("新增批量配置")
@Operation(summary = "新增一条", description = "传入BatConfig Obj")
public R save(@Valid @RequestBody BatConfig addOne) {
addOne.setId(null);
@ -145,6 +147,7 @@ public class BatConfigController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("批量配置修改")
@Operation(summary = "修改一条", description = "传入BatConfig Obj")
public R update(@Valid @RequestBody BatConfig updateOne) {
return R.status(service.updateById(updateOne));
@ -155,6 +158,7 @@ public class BatConfigController extends BladeController {
*/
@PostMapping("/updateBat")
@ApiOperationSupport(order = 41)
@ApiLog("批量配置修改批量")
@Operation(summary = "修改批量", description = "传入BatConfig List")
public R updateBat(@Valid @RequestBody List<BatConfig> updateList) {
return R.status(service.updateBatchById(updateList));
@ -185,6 +189,7 @@ public class BatConfigController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("批量配置逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -39,6 +39,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -141,6 +142,7 @@ public class BsAssignController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("分派规则维护新增")
@Operation(summary = "新增", description = "传入bsAssign")
public R save(@Valid @RequestBody BsAssignEntity bsAssign) {
return R.status(bsAssignService.save(bsAssign));
@ -164,6 +166,7 @@ public class BsAssignController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("分派规则维护修改")
@Operation(summary = "修改", description = "传入bsAssign")
public R update(@Valid @RequestBody BsAssignEntity bsAssign) {
@ -282,6 +285,7 @@ public class BsAssignController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("分派规则维护删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(bsAssignService.deleteLogic(Func.toLongList(ids)));

@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -124,6 +125,7 @@ public class CoatingThicknessController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("镀层厚度新增")
@Operation(summary = "新增一条", description = "传入CoatingThickness Obj")
public R save(@Valid @RequestBody CoatingThickness addOne) {
addOne.setId(null);
@ -148,6 +150,7 @@ public class CoatingThicknessController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("镀层厚度修改")
@Operation(summary = "修改一条", description = "传入CoatingThickness Obj")
public R update(@Valid @RequestBody CoatingThickness updateOne) {
return R.status(service.updateById(updateOne));
@ -206,6 +209,7 @@ public class CoatingThicknessController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("镀层厚度逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -36,6 +36,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -168,6 +169,7 @@ public class CraftAbilityController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("工艺能力新增")
@Operation(summary = "新增", description = "传入CraftAbility")
public R save(@Valid @RequestBody CraftAbilityEntity craftAbility) {
return R.status(craftAbilityService.save(craftAbility));
@ -178,6 +180,7 @@ public class CraftAbilityController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("工艺能力修改")
@Operation(summary = "修改", description = "传入CraftAbility")
public R update(@Valid @RequestBody CraftAbilityEntity craftAbility) {
return R.status(craftAbilityService.updateById(craftAbility));
@ -198,6 +201,7 @@ public class CraftAbilityController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("工艺能力删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(craftAbilityService.deleteLogic(Func.toLongList(ids)));

@ -19,6 +19,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -118,6 +119,7 @@ public class FormulaController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("计算公式新增")
@Operation(summary = "新增一条", description = "传入Formula Obj")
public R save(@Valid @RequestBody Formula addOne) {
addOne.setId(null);
@ -142,6 +144,7 @@ public class FormulaController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("计算公式修改")
@Operation(summary = "修改一条", description = "传入Formula Obj")
public R update(@Valid @RequestBody Formula updateOne) {
return R.status(service.updateById(updateOne));
@ -182,6 +185,7 @@ public class FormulaController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("计算公式删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -124,6 +125,7 @@ public class LocallyPlatedPartController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog(value = "局部镀零件新增")
@Operation(summary = "新增一条", description = "传入LocallyPlatedPart Obj")
public R save(@Valid @RequestBody LocallyPlatedPart addOne) {
addOne.setId(null);
@ -148,6 +150,7 @@ public class LocallyPlatedPartController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog(value = "局部镀零件修改")
@Operation(summary = "修改一条", description = "传入LocallyPlatedPart Obj")
public R update(@Valid @RequestBody LocallyPlatedPart updateOne) {
return R.status(service.updateById(updateOne));
@ -188,6 +191,7 @@ public class LocallyPlatedPartController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog(value = "局部镀零件逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -20,6 +20,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -134,6 +135,7 @@ public class MaterialQuotaController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog(value = "物料定额新增")
@Operation(summary = "新增一条", description = "传入MaterialQuota Obj")
public R save(@Valid @RequestBody MaterialQuota addOne) {
addOne.setId(null);
@ -158,6 +160,7 @@ public class MaterialQuotaController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog(value = "物料定额修改")
@Operation(summary = "修改一条", description = "传入MaterialQuota Obj")
public R update(@Valid @RequestBody MaterialQuota updateOne) {
return R.status(service.updateById(updateOne));
@ -198,6 +201,7 @@ public class MaterialQuotaController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog(value = "物料定额逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -254,6 +255,7 @@ public class OemController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("新增外协厂家")
@Operation(summary = "新增一条", description = "传入Oem Obj")
public R save(@Valid @RequestBody Oem addOne) {
addOne.setId(null);
@ -278,6 +280,7 @@ public class OemController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("修改外协厂家")
@Operation(summary = "修改一条", description = "传入Oem Obj")
public R update(@Valid @RequestBody Oem updateOne) {
return R.status(service.updateById(updateOne));
@ -318,6 +321,7 @@ public class OemController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("逻辑删除外协厂家")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -139,6 +140,7 @@ public class PlanAssignSteerController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog(value = "外协分派新增")
@Operation(summary = "新增一条", description = "传入PlanAssignSteer Obj")
public R save(@Valid @RequestBody PlanAssignSteer addOne) {
addOne.setId(null);
@ -163,6 +165,7 @@ public class PlanAssignSteerController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog(value = "外协分派修改")
@Operation(summary = "修改一条", description = "传入PlanAssignSteer Obj")
public R update(@Valid @RequestBody PlanAssignSteer updateOne) {
return R.status(service.updateById(updateOne));
@ -203,6 +206,7 @@ public class PlanAssignSteerController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog(value = "外协分派逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.CommonConstant;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -156,6 +157,7 @@ public class PlatingController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("[镀种] 新增")
@Operation(summary = "新增一条", description = "传入Plating Obj")
public R save(@Valid @RequestBody Plating addOne) {
@ -187,6 +189,7 @@ public class PlatingController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("[镀种] 修改")
@Operation(summary = "修改一条", description = "传入Plating Obj")
public R update(@Valid @RequestBody Plating updateOne) {
@ -237,6 +240,7 @@ public class PlatingController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("[镀种] 逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -136,6 +137,7 @@ public class PlatingSmallController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("镀种小类新增")
@Operation(summary = "新增一条", description = "传入PlatingSmall Obj")
public R save(@Valid @RequestBody PlatingSmall addOne) {
addOne.setId(null);
@ -160,6 +162,7 @@ public class PlatingSmallController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("镀种小类修改")
@Operation(summary = "修改一条", description = "传入PlatingSmall Obj")
public R update(@Valid @RequestBody PlatingSmall updateOne) {
return R.status(service.updateById(updateOne));
@ -200,6 +203,7 @@ public class PlatingSmallController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("镀种小类逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -120,6 +121,7 @@ public class ProcessAbilityController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("工艺能力新增")
@Operation(summary = "新增一条", description = "传入ProcessAbility Obj")
public R save(@Valid @RequestBody ProcessAbility addOne) {
addOne.setId(null);
@ -144,6 +146,7 @@ public class ProcessAbilityController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("工艺能力修改")
@Operation(summary = "修改一条", description = "传入ProcessAbility Obj")
public R update(@Valid @RequestBody ProcessAbility updateOne) {
return R.status(service.updateById(updateOne));
@ -184,6 +187,7 @@ public class ProcessAbilityController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("工艺能力逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -145,6 +146,7 @@ public class ProdMarkController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog(value = "生产标识新增")
@Operation(summary = "新增一条", description = "传入ProdMark Obj")
public R save(@Valid @RequestBody ProdMark addOne) {
addOne.setId(null);
@ -169,6 +171,7 @@ public class ProdMarkController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog(value = "生产标识修改")
@Operation(summary = "修改一条", description = "传入ProdMark Obj")
public R update(@Valid @RequestBody ProdMark updateOne) {
return R.status(service.updateById(updateOne));
@ -209,6 +212,7 @@ public class ProdMarkController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog(value = "生产标识逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -121,6 +122,7 @@ public class RelTeamSetUserController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("班组用户关联新增")
@Operation(summary = "新增一条", description = "传入RelTeamSetUser Obj")
public R save(@Valid @RequestBody RelTeamSetUser addOne) {
addOne.setId(null);
@ -145,6 +147,7 @@ public class RelTeamSetUserController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("班组用户关联修改")
@Operation(summary = "修改一条", description = "传入RelTeamSetUser Obj")
public R update(@Valid @RequestBody RelTeamSetUser updateOne) {
return R.status(service.updateById(updateOne));
@ -185,6 +188,7 @@ public class RelTeamSetUserController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("班组用户关联逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -124,6 +125,7 @@ public class ShiftsController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog(value = "班次新增一条")
@Operation(summary = "新增一条", description = "传入Shifts Obj")
public R save(@Valid @RequestBody Shifts addOne) {
addOne.setId(null);
@ -148,6 +150,7 @@ public class ShiftsController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog(value = "班次修改一条")
@Operation(summary = "修改一条", description = "传入Shifts Obj")
public R update(@Valid @RequestBody Shifts updateOne) {
return R.status(service.updateById(updateOne));
@ -188,6 +191,7 @@ public class ShiftsController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog(value = "班次逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -17,6 +17,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -354,6 +355,7 @@ public class TeamSetController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("班组新增")
@Operation(summary = "新增一条", description = "传入TeamSet Obj")
public R save(@Valid @RequestBody TeamSet addOne) {
addOne.setId(null);
@ -382,6 +384,7 @@ public class TeamSetController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("班组修改")
@Operation(summary = "修改一条", description = "传入TeamSet Obj")
public R update(@Valid @RequestBody TeamSet updateOne) {
R<User> user= iUserClient.userInfoById(updateOne.getDispatcher());
@ -429,6 +432,7 @@ public class TeamSetController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("班组逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -17,6 +17,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -155,6 +156,7 @@ public class WorkCenterController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("作业中心新增")
@Operation(summary = "新增一条", description = "传入WorkCenter Obj")
public R save(@Valid @RequestBody WorkCenter addOne) {
addOne.setId(null);
@ -349,6 +351,7 @@ public class WorkCenterController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("作业中心修改")
@Operation(summary = "修改一条", description = "传入WorkCenter Obj")
public R update(@Valid @RequestBody WorkCenter updateOne) {
return R.status(service.updateById(updateOne));
@ -389,6 +392,7 @@ public class WorkCenterController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("作业中心逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -17,6 +17,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -143,6 +144,7 @@ public class WorkTankController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 30)
@ApiLog("作业槽新增")
@Operation(summary = "新增一条", description = "传入WorkTank Obj")
public R save(@Valid @RequestBody WorkTank addOne) {
@ -175,6 +177,7 @@ public class WorkTankController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 40)
@ApiLog("作业槽修改")
@Operation(summary = "修改一条", description = "传入WorkTank Obj")
public R update(@Valid @RequestBody WorkTank updateOne) {
@ -227,6 +230,7 @@ public class WorkTankController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 61)
@ApiLog("作业槽逻辑删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids)));

@ -87,6 +87,14 @@ public class InspectionTaskController extends BladeController {
private IWorkPlanService workPlanService;
@Resource
private IMacToolUseService macToolUseService;
@Resource
IDsPartRelationService dsPartRelationService;
@Resource
IDsPartVersionService dsPartVersionService;
@Resource
IDsPartService dsPartService;
@Resource
private IYieldOrderService yieldOrderService;
/**
* [检验任务] 详情
*/
@ -150,6 +158,35 @@ public class InspectionTaskController extends BladeController {
return R.data(pagesVO);
}
@GetMapping("/queryWorkOrder")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入inspectionTask")
public R<IPage<InspectionTaskListVO>> queryWorkOrder(InspectionTaskSearch search,Query query) {
log.info("search = {}", search);
log.info("query = {}", query);
log.info("getUserRole = {}", AuthUtil.getUserRole());
// 热表 烧结 检验员 数据区分。
if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) {
search.setFromType(InspectionTaskConst.FROM_TYPE_RB);
}
if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) {
search.setFromType(InspectionTaskConst.FROM_TYPE_SJ);
}
if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) {
search.setFromType(null);
}
IPage<InspectionTaskListVO> pagesVO = service.queryWorkOrder(Condition.getPage(query), search);
return R.data(pagesVO);
}
@GetMapping("/correspondingProcess")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入inspectionTask")
public R<List<InspectionTaskListVO>> correspondingProcess(Long woId) {
List<InspectionTaskListVO> pagesVO = service.correspondingProcess(woId);
return R.data(pagesVO);
}
/**
* [检验任务] 自定义分页
*/
@ -358,14 +395,7 @@ public class InspectionTaskController extends BladeController {
return R.data(list);
}
@Resource
IDsPartRelationService dsPartRelationService;
@Resource
IDsPartVersionService dsPartVersionService;
@Resource
IDsPartService dsPartService;
@Resource
private IYieldOrderService yieldOrderService;
@GetMapping("/toQaRecord")

@ -124,8 +124,18 @@ public class ProReTemplateController extends BladeController {
@ApiOperationSupport(order = 30)
@Operation(summary = "新增一条", description = "传入ProReTemplate Obj")
public R save(@Valid @RequestBody ProReTemplate addOne) {
QueryWrapper<ProReTemplate> qw = new QueryWrapper<>();
qw.eq("WC_ID",addOne.getWcId());
qw.eq("PPS_ID",addOne.getPpsId());
qw.eq("APPROVAL_STATUS",2);
List<ProReTemplate> list = service.list(qw);
if(null != list && list.size() > 0){
return R.fail("存在对应作业中心-工序配置");
}
addOne.setStatus(ProReTemplateConst.STATUS_NEW);
addOne.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1);
// addOne.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1);
addOne.setId(null);
return R.status(service.save(addOne));
}
@ -152,6 +162,17 @@ public class ProReTemplateController extends BladeController {
@ApiOperationSupport(order = 40)
@Operation(summary = "修改一条", description = "传入ProReTemplate Obj")
public R update(@Valid @RequestBody ProReTemplate updateOne) {
QueryWrapper<ProReTemplate> qw = new QueryWrapper<>();
qw.eq("WC_ID",updateOne.getWcId());
qw.eq("PPS_ID",updateOne.getPpsId());
qw.eq("APPROVAL_STATUS",2);
qw.ne("ID",updateOne.getId());
List<ProReTemplate> list = service.list(qw);
if(null != list && list.size() > 0){
return R.fail("存在对应作业中心-工序配置");
}
return R.status(service.updateById(updateOne));
}

@ -39,6 +39,7 @@ public interface InspectionTaskMapper extends BaseMapper<InspectionTask> {
* @return List<InspectionTaskExcel>
*/
List<InspectionTaskExcel> exportInspectionTask(@Param("ew") Wrapper<InspectionTask> queryWrapper);
List<InspectionTaskListVO> queryWorkOrder(IPage page, @Param("q") InspectionTaskSearch search);
List<InspectionTaskListVO> correspondingProcess(@Param("woId") Long woId);
List<InspectionTaskListVO> listSearch(IPage<InspectionTaskListVO> page, @Param("q") InspectionTaskSearch search);
}

@ -235,4 +235,108 @@
-- oem
ORDER BY t.ID DESC
</select>
<select id="queryWorkOrder"
resultType="org.springblade.desk.quality.pojo.vo.InspectionTaskListVO">
SELECT
wo.*,
-- 完工时间:仅当运行状态为15时取更新时间,否则为null
CASE WHEN wo.RUN_STATUS = 15 THEN wo.update_time ELSE null END AS finishDate,
yo.id AS yoId,
ts.TS_NAME AS mainProcessingUnit,
yo.USE_DEPT AS needDeptName,
wo.batch_no AS batchNo,
wo.batch_no AS poBatchNo,
ps.NAME AS currentProcessName,
yo.PRODUCT_IDENT AS prodIdent,
yo.YP_AREA * wo.MAKE_QTY AS areaTotal,
yo.YP_AREA AS area,
wo.MAKE_QTY AS poQty,
wo.WO_CODE AS woCode,
wo.PART_CODE AS partCode,
wo.CARD_NO AS cardNo
FROM MES_WORK_ORDER wo
-- 车间作业计划 wp
LEFT JOIN MES_WORK_PLAN wp ON wp.WO_ID = wo.ID
-- 生产订单 yo
LEFT JOIN MES_YIELD_ORDER yo ON wo.YO_ID = yo.ID
-- 工序
LEFT JOIN BS_PROCESS_SET ps ON wp.ORDERS = ps.CODE
-- 外协厂商 oem
LEFT JOIN BS_OEM oem ON wp.OC_ID = oem.ID
-- 班组 ts
LEFT JOIN BS_TEAM_SET ts ON wp.MAKE_TEAM = ts.ID
WHERE
wo.IS_DELETED = 0
<if test="q.wpId != null">
AND t.WP_ID = #{q.wpId}
</if>
<if test="q.status != null">
AND t.STATUS = #{q.status}
</if>
<if test="q.fromType != null">
AND t.FROM_TYPE = #{q.fromType}
</if>
<if test="q.receiveDateStart != null">
AND rs.RECEIVE_DATE &gt;= #{q.receiveDateStart}
</if>
<if test="q.receiveDateStart != null">
AND rs.RECEIVE_DATE &lt;= #{q.receiveDateEnd}
</if>
<if test="q.teamSetId != null">
AND wo.MAKE_TEAM = #{q.teamSetId}
</if>
<if test="q.oemId != null">
AND wp.OC_ID = #{q.oemId}
</if>
<if test="q.frontProcessId != null">
AND wp.FRONT_WP_ID = #{q.frontProcessId}
</if>
<if test="q.nextProcessId != null">
AND wp.NEXT_WP_ID = #{q.nextProcessId}
</if>
<if test="q.cardNo != null and q.cardNo != ''">
AND wo.CARD_NO = #{q.cardNo}
</if>
<if test="q.woCode != null">
AND wo.WO_CODE = #{q.woCode}
</if>
<if test="q.partCode != null and q.partCode != ''">
AND wo.PART_CODE = #{q.partCode}
</if>
<if test="q.batchNo != null and q.batchNo != ''">
AND wo.BATCH_NO = #{q.batchNo}
</if>
<if test="q.poQty != null">
AND wo.MAKE_QTY = #{q.poQty}
</if>
<if test="q.prodIdent != null and q.prodIdent != ''">
AND yo.PRODUCT_IDENT = #{q.prodIdent}
</if>
<if test="q.cardNo != null and q.cardNo != ''">
AND wo.CARD_NO = #{cardNo}
</if>
<if test="q.currentProcessId != null">
AND ps.ID = #{q.currentProcessId}
</if>
</select>
<select id="correspondingProcess"
resultType="org.springblade.desk.quality.pojo.vo.InspectionTaskListVO">
SELECT
ps.NAME AS ppsName,
ps.ID AS ppsId,
ps.CODE AS ppsCode
FROM MES_WORK_ORDER wo
-- 车间作业计划 wp
LEFT JOIN MES_WORK_PLAN wp ON wp.WO_ID = wo.ID
-- 工序
LEFT JOIN BS_PROCESS_SET ps ON wp.ORDERS = ps.CODE
WHERE
wo.IS_DELETED = 0 and wo.id = #{woId}
</select>
</mapper>

@ -7,6 +7,7 @@ package org.springblade.desk.quality.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Parameter;
import org.apache.ibatis.annotations.Param;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.tool.api.R;
@ -112,7 +113,8 @@ public interface IInspectionTaskService extends BaseService<InspectionTask> {
public R fill(InspectionTaskDetailVO detailVO);
IPage<InspectionTaskListVO> listSearch(IPage<InspectionTaskListVO> page, InspectionTaskSearch search);
IPage<InspectionTaskListVO> queryWorkOrder(IPage<InspectionTaskListVO> page, InspectionTaskSearch search);
List<InspectionTaskListVO> correspondingProcess(Long woId);
R getSamePlace(Long id);
R sameResultCopy(Long sourceId, Long targetId);

@ -337,6 +337,20 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
return page.setRecords(listVO);
}
@Override
public IPage<InspectionTaskListVO> queryWorkOrder(IPage<InspectionTaskListVO> page, InspectionTaskSearch search) {
List<InspectionTaskListVO> listVO = baseMapper.queryWorkOrder(page, search);
for (InspectionTaskListVO oneVO : listVO) {
setListVOValue(oneVO);
}
return page.setRecords(listVO);
}
@Override
public List<InspectionTaskListVO> correspondingProcess(Long woId) {
return baseMapper.correspondingProcess(woId);
}
@Override
public R getSamePlace(Long id) {
// LambdaQueryWrapper<InspectionTask> qw = Wrappers.lambdaQuery();

@ -50,12 +50,16 @@ import org.springblade.system.feign.IDictClient;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.UserInfo;
import org.springframework.http.HttpEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import org.springframework.web.client.RestTemplate;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
/**
* [生产处置单] 服务实现类
*
@ -83,6 +87,8 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
private ISysClient sysClient;
@Resource
private IDictClient dictClient;
@Resource
private RestTemplate httpClientTemplate;
@Override
public IPage<ReviewSheetDetailVO> selectReviewSheetPage(IPage<ReviewSheetDetailVO> page, ReviewSheetDetailVO reviewSheet) {
@ -372,6 +378,29 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
rs.setHasSaved(BaseValue.YES);
// 处置单
saveOrUpdate(rs);
// if (ReviewSheetConst.BizType.T_ERP.equals(rs.getBizType())) {
// HttpHeaders headers = new HttpHeaders();
// headers.setContentType(MediaType.APPLICATION_JSON);
// JSONObject obj = new JSONObject();
// obj.put("qmsRepairApplyDTO", rs);
// obj.put("qmsRepairPartList", listD);
// obj.put("qmsRepairMalfList", listF);
// HttpEntity<JSONObject> entity = new HttpEntity<>(obj, headers);
// ResponseEntity<JSONObject> responseEntity;
// JSONObject responseBody;
// try {
// responseEntity = httpClientTemplate.postForEntity("http://192.168.119.68:10113" +
// "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class);
// JSONObject result = responseEntity.getBody();
//
// responseBody = result.getJSONObject("responseBody");
// if (responseBody == null) {
// throw new BusinessException("审理单,接口返回值null");
// }
// } catch (Exception e) {
// throw new RuntimeException("审理单,接口返回值null");
// }
// }
return R.success("成功");
}

@ -0,0 +1,18 @@
package org.springblade.desk.quality.util;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;
@Configuration
public class RestTemplateConfig {
/**
* 声明 RestTemplate Bean供其他类注入使用
* @return RestTemplate 实例
*/
@Bean("httpClientTemplate") // Bean 名称和你注入的名称保持一致(httpClientTemplate)
public RestTemplate restTemplate() {
// 创建并返回 RestTemplate 实例
return new RestTemplate();
}
}
Loading…
Cancel
Save