suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备+转岗+外协操作日志

Browse Source
liweidong
qinyulong 1 month ago
parent e9736985de
commit 4c55c82921
17 changed files with 82 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
  2. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java
  3. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasurementRecordsController.java
  4. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java
  5. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java
  6. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java
  7. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateTypeController.java
  8. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java
  9. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/PostHandleController.java
  10. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/TrainingPlanController.java
  11. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemAndAbilityController.java
  12. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemMeritsController.java
  13. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemOrderController.java
  14. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemProcessController.java
  15. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemSpecialProController.java
  16. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemStatementController.java
  17. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/PlatingTypeRulesController.java

5
blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
Unescape View File

@ -39,6 +39,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;
@ -108,6 +109,7 @@ public class EquipmentController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入equipment")
@ApiLog("设备台账 新增")
public R save(@Valid @RequestBody EquipmentEntity equipment) {
return R.status(equipmentService.save(equipment));
}
@ -118,6 +120,7 @@ public class EquipmentController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入equipment")
@ApiLog("设备台账 修改")
public R update(@Valid @RequestBody EquipmentEntity equipment) {
return R.status(equipmentService.updateById(equipment));
}
@ -127,6 +130,7 @@ public class EquipmentController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("设备台账 增改")
@Operation(summary = "新增或修改", description = "传入equipment")
public R submit(@Valid @RequestBody EquipmentEntity equipment) {
return R.status(equipmentService.saveOrUpdate(equipment));
@ -138,6 +142,7 @@ public class EquipmentController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("设备台账 删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(equipmentService.deleteLogic(Func.toLongList(ids)));
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java
Unescape View File

@ -15,6 +15,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;
@ -79,6 +80,7 @@ public class FeiBaSetController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入feiBaSet")
@ApiLog("飞靶 新增")
public R save(@Valid @RequestBody FeiBaSetEntity feiBaSet) {
return R.status(feiBaSetService.save(feiBaSet));
}
@ -89,6 +91,7 @@ public class FeiBaSetController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入feiBaSet")
@ApiLog("飞靶 修改")
public R update(@Valid @RequestBody FeiBaSetEntity feiBaSet) {
return R.status(feiBaSetService.updateById(feiBaSet));
}
@ -99,6 +102,7 @@ public class FeiBaSetController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入feiBaSet")
@ApiLog("飞靶 新增或修改")
public R submit(@Valid @RequestBody FeiBaSetEntity feiBaSet) {
return R.status(feiBaSetService.saveOrUpdate(feiBaSet));
}
@ -109,6 +113,7 @@ public class FeiBaSetController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("飞靶 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(feiBaSetService.deleteLogic(Func.toLongList(ids)));
}

4
blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasurementRecordsController.java
Unescape View File

@ -13,6 +13,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.tool.api.R;
@ -83,6 +84,7 @@ public class MeasurementRecordsController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入mesMeasurementRecords")
@ApiLog("量具计量记录 新增")
public R save(@Valid @RequestBody MeasurementRecordsEntity mesMeasurementRecords) {
MeasurementRecordsEntity one = mesMeasurementRecordsService.getOne(Wrappers.<MeasurementRecordsEntity>lambdaQuery().eq(MeasurementRecordsEntity::getMcCode, mesMeasurementRecords.getMcCode()));
if (one != null) {
@ -97,6 +99,7 @@ public class MeasurementRecordsController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入mesMeasurementRecords")
@ApiLog("量具计量记录 修改")
public R update(@Valid @RequestBody MeasurementRecordsEntity mesMeasurementRecords) {
MeasurementRecordsEntity one = mesMeasurementRecordsService.getOne(Wrappers.<MeasurementRecordsEntity>lambdaQuery().eq(MeasurementRecordsEntity::getMcCode, mesMeasurementRecords.getMcCode()));
if (one != null && !one.getId().equals(mesMeasurementRecords.getId())) {
@ -121,6 +124,7 @@ public class MeasurementRecordsController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("量具计量记录 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(mesMeasurementRecordsService.deleteLogic(Func.toLongList(ids)));
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java
Unescape View File

@ -10,6 +10,7 @@ import jakarta.annotation.Resource;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -81,6 +82,7 @@ public class MeasuringUpkeepController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入measuringUpkeep")
@ApiLog("量具保养 新增")
public R save(@Valid @RequestBody MeasuringUpkeepEntity measuringUpkeep) {
return R.status(measuringUpkeepService.save(measuringUpkeep));
}
@ -91,6 +93,7 @@ public class MeasuringUpkeepController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入measuringUpkeep")
@ApiLog("量具保养 修改")
public R update(@Valid @RequestBody MeasuringUpkeepEntity measuringUpkeep) {
return R.status(measuringUpkeepService.updateById(measuringUpkeep));
}
@ -101,6 +104,7 @@ public class MeasuringUpkeepController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入measuringUpkeep")
@ApiLog("量具保养 新增或修改")
public R submit(@Valid @RequestBody MeasuringUpkeepEntity measuringUpkeep) {
return R.status(measuringUpkeepService.saveOrUpdate(measuringUpkeep));
}
@ -111,6 +115,7 @@ public class MeasuringUpkeepController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("量具保养 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(measuringUpkeepService.deleteLogic(Func.toLongList(ids)));
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java
Unescape View File

@ -37,6 +37,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
@ -107,6 +108,7 @@ public class RackSetController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入rackSet")
@ApiLog("挂具 新增")
public R save(@Valid @RequestBody RackSetEntity rackSet) {
return R.status(rackSetService.save(rackSet));
}
@ -117,6 +119,7 @@ public class RackSetController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入rackSet")
@ApiLog("挂具 修改")
public R update(@Valid @RequestBody RackSetEntity rackSet) {
return R.status(rackSetService.updateById(rackSet));
}
@ -127,6 +130,7 @@ public class RackSetController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入rackSet")
@ApiLog("挂具 新增或修改")
public R submit(@Valid @RequestBody RackSetEntity rackSet) {
return R.status(rackSetService.saveOrUpdate(rackSet));
}
@ -137,6 +141,7 @@ public class RackSetController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("挂具 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(rackSetService.deleteLogic(Func.toLongList(ids)));
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java
Unescape View File

@ -12,6 +12,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
@ -84,6 +85,7 @@ public class RecorderTypeController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入recorderType")
@ApiLog("记录仪分类 新增")
public R save(@Valid @RequestBody RecorderTypeEntity recorderType) {
LambdaQueryWrapper<RecorderTypeEntity> wrapper = Wrappers.<RecorderTypeEntity>lambdaQuery()
.eq(Objects.nonNull(recorderType.getCrtCode()), RecorderTypeEntity::getCrtCode, recorderType.getCrtCode())
@ -101,6 +103,7 @@ public class RecorderTypeController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入recorderType")
@ApiLog("记录仪分类 修改")
public R update(@Valid @RequestBody RecorderTypeEntity recorderType) {
LambdaQueryWrapper<RecorderTypeEntity> wrapper = Wrappers.<RecorderTypeEntity>lambdaQuery()
.eq(Objects.nonNull(recorderType.getCrtCode()), RecorderTypeEntity::getCrtCode, recorderType.getCrtCode())
@ -118,6 +121,7 @@ public class RecorderTypeController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入recorderType")
@ApiLog("记录仪分类 新增或修改")
public R submit(@Valid @RequestBody RecorderTypeEntity recorderType) {
LambdaQueryWrapper<RecorderTypeEntity> wrapper = Wrappers.<RecorderTypeEntity>lambdaQuery()
.eq(Objects.nonNull(recorderType.getCrtCode()), RecorderTypeEntity::getCrtCode, recorderType.getCrtCode())
@ -135,6 +139,7 @@ public class RecorderTypeController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("记录仪分类 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(recorderTypeService.deleteLogic(Func.toLongList(ids)));
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateTypeController.java
Unescape View File

@ -7,6 +7,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -71,6 +72,7 @@ public class CertificateTypeController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入certificateType")
@ApiLog("证书类型 新增")
public R save(@Valid @RequestBody CertificateTypeEntity certificateType) {
return R.status(certificateTypeService.save(certificateType));
}
@ -81,6 +83,7 @@ public class CertificateTypeController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入certificateType")
@ApiLog("证书类型 修改")
public R update(@Valid @RequestBody CertificateTypeEntity certificateType) {
return R.status(certificateTypeService.updateById(certificateType));
}
@ -91,6 +94,7 @@ public class CertificateTypeController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入certificateType")
@ApiLog("证书类型 新增或修改")
public R submit(@Valid @RequestBody CertificateTypeEntity certificateType) {
return R.status(certificateTypeService.saveOrUpdate(certificateType));
}
@ -101,6 +105,7 @@ public class CertificateTypeController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("证书类型 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(certificateTypeService.deleteLogic(Func.toLongList(ids)));
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java
Unescape View File

@ -11,6 +11,7 @@ import jakarta.annotation.PostConstruct;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -91,6 +92,7 @@ public class EquipmentMaintenanceController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入equipmentMaintenance")
@ApiLog("人员设备台账 新增")
public R save(@Valid @RequestBody EquipmentMaintenanceEntity equipmentMaintenance) {
return R.status(equipmentMaintenanceService.save(equipmentMaintenance));
}
@ -101,6 +103,7 @@ public class EquipmentMaintenanceController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入equipmentMaintenance")
@ApiLog("人员设备台账 修改")
public R update(@Valid @RequestBody EquipmentMaintenanceEntity equipmentMaintenance) {
return R.status(equipmentMaintenanceService.updateById(equipmentMaintenance));
}
@ -111,6 +114,7 @@ public class EquipmentMaintenanceController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入equipmentMaintenance")
@ApiLog("人员设备台账 新增或修改")
public R submit(@Valid @RequestBody EquipmentMaintenanceEntity equipmentMaintenance) {
return R.status(equipmentMaintenanceService.saveOrUpdate(equipmentMaintenance));
}
@ -121,6 +125,7 @@ public class EquipmentMaintenanceController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("人员设备台账 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(equipmentMaintenanceService.deleteLogic(Func.toLongList(ids)));
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/PostHandleController.java
Unescape View File

@ -10,6 +10,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
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.tool.api.R;
@ -90,6 +91,7 @@ public class PostHandleController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入postHandle")
@ApiLog("人员岗位 新增")
public R save(@Valid @RequestBody PostHandleEntity postHandle) {
return R.status(postHandleService.save(postHandle));
}
@ -100,6 +102,7 @@ public class PostHandleController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入postHandle")
@ApiLog("人员岗位 修改")
public R update(@Valid @RequestBody PostHandleEntity postHandle) {
return R.status(postHandleService.updateById(postHandle));
}
@ -110,6 +113,7 @@ public class PostHandleController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入postHandle")
@ApiLog("人员岗位 新增或修改")
public R submit(@Valid @RequestBody PostHandleEntity postHandle) {
return postHandleService.saveOrUpdateHandle(postHandle);
}
@ -120,6 +124,7 @@ public class PostHandleController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("人员岗位 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(postHandleService.deleteLogic(Func.toLongList(ids)));
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/TrainingPlanController.java
Unescape View File

@ -10,6 +10,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -77,6 +78,7 @@ public class TrainingPlanController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入trainingPlan")
@ApiLog("培训计划模板 新增")
public R save(@Valid @RequestBody TrainingPlanEntity trainingPlan) {
return R.status(trainingPlanService.save(trainingPlan));
}
@ -87,6 +89,7 @@ public class TrainingPlanController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入trainingPlan")
@ApiLog("培训计划模板 修改")
public R update(@Valid @RequestBody TrainingPlanEntity trainingPlan) {
return R.status(trainingPlanService.updateById(trainingPlan));
}
@ -96,6 +99,7 @@ public class TrainingPlanController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("培训计划模板 新增或修改")
@Operation(summary = "新增或修改", description = "传入trainingPlan")
public R submit(@Valid @RequestBody TrainingPlanEntity trainingPlan) {
return R.status(trainingPlanService.saveOrUpdate(trainingPlan));
@ -106,6 +110,7 @@ public class TrainingPlanController 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(trainingPlanService.deleteLogic(Func.toLongList(ids)));

5
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemAndAbilityController.java
Unescape View File

@ -7,6 +7,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
@ -83,6 +84,7 @@ public class OemAndAbilityController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入mesOemAndAbility")
@ApiLog("外协绩效模板 新增")
public R save(@Valid @RequestBody OemAndAbilityEntity mesOemAndAbility) {
return R.status(mesOemAndAbilityService.save(mesOemAndAbility));
}
@ -93,6 +95,7 @@ public class OemAndAbilityController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入mesOemAndAbility")
@ApiLog("外协绩效模板 修改")
public R update(@Valid @RequestBody OemAndAbilityEntity mesOemAndAbility) {
return R.status(mesOemAndAbilityService.updateById(mesOemAndAbility));
}
@ -103,6 +106,7 @@ public class OemAndAbilityController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入mesOemAndAbility")
@ApiLog("外协绩效模板 新增或修改")
public R submit(@Valid @RequestBody OemAndAbilityEntity mesOemAndAbility) {
return R.status(mesOemAndAbilityService.saveOrUpdate(mesOemAndAbility));
}
@ -113,6 +117,7 @@ public class OemAndAbilityController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("外协绩效模板 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(mesOemAndAbilityService.deleteLogic(Func.toLongList(ids)));
}

6
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemMeritsController.java
Unescape View File

@ -7,6 +7,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
@ -125,6 +126,7 @@ public class OemMeritsController extends BladeController {
@PostMapping("/applyOemMerits")
@ApiOperationSupport(order = 8)
@Operation(summary = "外协绩效申请", description = "")
@ApiLog("外协绩效 申请")
public R applyOemMerits(@Valid @RequestBody ApplyOemMeritsSave applyOemMeritsSave) {
String dateStr = applyOemMeritsSave.getDate();
List<OemMeritsEntity> oemMeritsEntities = applyOemMeritsSave.getOemMeritsEntities();
@ -138,6 +140,7 @@ public class OemMeritsController extends BladeController {
@PostMapping("/maintenance")
@ApiOperationSupport(order = 9)
@Operation(summary = "维护厂家绩效", description = "")
@ApiLog("厂家绩效 维护")
public R maintenance(@Valid @RequestBody MaintenanceSave maintenanceSave) {
maintenanceSave.setStatus(OemMeritsEntity.QUALITY_IN);
return mesOemMeritsService.maintenance(maintenanceSave);
@ -150,6 +153,7 @@ public class OemMeritsController extends BladeController {
@PostMapping("/proofread")
@ApiOperationSupport(order = 10)
@Operation(summary = "校对厂家绩效", description = "")
@ApiLog("厂家绩效 校对")
public R proofread(@Valid @RequestBody ProofreadSave proofreadSave) {
proofreadSave.setStatus(OemMeritsEntity.QUALITY_OK);
return mesOemMeritsService.proofread(proofreadSave);
@ -171,6 +175,7 @@ public class OemMeritsController extends BladeController {
@PostMapping("/submitData")
@ApiOperationSupport(order = 12)
@Operation(summary = "厂家绩效评审保存", description = "")
@ApiLog("厂家绩效 评审")
public R submitData(@Valid @RequestBody List<OemMeritsEntity> oemMeritsEntities) {
return mesOemMeritsService.submitData(oemMeritsEntities);
}
@ -181,6 +186,7 @@ public class OemMeritsController extends BladeController {
@PostMapping("/processSubmit")
@ApiOperationSupport(order = 13)
@Operation(summary = "厂家绩效审核保存", description = "")
@ApiLog("厂家绩效 审核")
public R processSubmit(@Valid @RequestBody List<OemMeritsEntity> oemMeritsEntities) {
return mesOemMeritsService.processSubmit(oemMeritsEntities);
}

4
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemOrderController.java
Unescape View File

@ -16,6 +16,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.utils.AuthUtil;
@ -87,6 +88,7 @@ public class OemOrderController extends BladeController {
@PostMapping("/oemTakeBack")
@ApiOperationSupport(order = 2)
@Operation(summary = "协订单收回", description = "")
@ApiLog("协订单 收回")
public R oemTakeBack(@Valid @RequestBody OemTakeBack oemTakeBack) {
return workOrderRunService.oemTakeBack(oemTakeBack);
}
@ -137,6 +139,7 @@ public class OemOrderController extends BladeController {
@PostMapping(value = "/inOemBatches")
@ApiOperationSupport(order = 6)
@Operation(summary = "外协分批", description = "")
@ApiLog("外协分批")
public R inOemBatches(@RequestBody InBatchesDTO inBatchesDTO) {
Long userId = AuthUtil.getUserId();
return workOrderService.inOemBatches(inBatchesDTO.getId(), inBatchesDTO, userId);
@ -149,6 +152,7 @@ public class OemOrderController extends BladeController {
@PostMapping("/changeOemManufacturer")
@ApiOperationSupport(order = 6)
@Operation(summary = "更改外协厂商", description = "")
@ApiLog("外协厂商 更改")
public R changeOemManufacturer(@Parameter(description = "车间运行订单ID", required = true) @RequestParam Long worId,
@Parameter(description = "外协厂商ID", required = true) @RequestParam Long ocId) {
return workOrderRunService.changeOemManufacturer(worId, ocId);

5
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemProcessController.java
Unescape View File

@ -8,6 +8,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
@ -85,6 +86,7 @@ public class OemProcessController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入mesOemProcess")
@ApiLog("外协工序 新增")
public R save(@Valid @RequestBody OemProcessEntity mesOemProcess) {
OemProcessEntity one = mesOemProcessService.getOne(Wrappers.<OemProcessEntity>lambdaQuery().eq(OemProcessEntity::getProcessId, mesOemProcess.getProcessId()));
if (one != null) {
@ -99,6 +101,7 @@ public class OemProcessController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入mesOemProcess")
@ApiLog("外协工序 修改")
public R update(@Valid @RequestBody OemProcessEntity mesOemProcess) {
OemProcessEntity one = mesOemProcessService.getOne(Wrappers.<OemProcessEntity>lambdaQuery().eq(OemProcessEntity::getProcessId, mesOemProcess.getProcessId()));
if (one != null && !one.getId().equals(mesOemProcess.getId())) {
@ -113,6 +116,7 @@ public class OemProcessController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入mesOemProcess")
@ApiLog("外协工序 新增或修改")
public R submit(@Valid @RequestBody OemProcessEntity mesOemProcess) {
OemProcessEntity one = mesOemProcessService.getOne(Wrappers.<OemProcessEntity>lambdaQuery().eq(OemProcessEntity::getProcessId, mesOemProcess.getProcessId()));
if (one != null && !one.getId().equals(mesOemProcess.getId())) {
@ -127,6 +131,7 @@ public class OemProcessController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("外协工序 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(mesOemProcessService.deleteLogic(Func.toLongList(ids)));
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemSpecialProController.java
Unescape View File

@ -7,6 +7,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
@ -83,6 +84,7 @@ public class OemSpecialProController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入mesOemSpecialPro")
@ApiLog("外协特殊过程项 新增")
public R save(@Valid @RequestBody OemSpecialProEntity mesOemSpecialPro) {
return R.status(mesOemSpecialProService.save(mesOemSpecialPro));
}
@ -93,6 +95,7 @@ public class OemSpecialProController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入mesOemSpecialPro")
@ApiLog("外协特殊过程项 修改")
public R update(@Valid @RequestBody OemSpecialProEntity mesOemSpecialPro) {
return R.status(mesOemSpecialProService.updateById(mesOemSpecialPro));
}
@ -103,6 +106,7 @@ public class OemSpecialProController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入mesOemSpecialPro")
@ApiLog("外协特殊过程项 新增或修改")
public R submit(@Valid @RequestBody OemSpecialProEntity mesOemSpecialPro) {
return R.status(mesOemSpecialProService.saveOrUpdate(mesOemSpecialPro));
}
@ -113,6 +117,7 @@ public class OemSpecialProController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("外协特殊过程项 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(mesOemSpecialProService.deleteLogic(Func.toLongList(ids)));
}

3
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemStatementController.java
Unescape View File

@ -7,6 +7,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -121,6 +122,7 @@ public class OemStatementController extends BladeController {
@PostMapping("/oemSettleAccounts")
@ApiOperationSupport(order = 8)
@Operation(summary = "外协手动结算", description = "")
@ApiLog("外协手动结算")
public R oemSettleAccounts(@Valid @RequestBody OemSettleAccountsSave oemSettleAccountsSave) {
return mesOemStatementService.oemSettleAccounts(oemSettleAccountsSave.getStatementList(), oemSettleAccountsSave.getPrice(), oemSettleAccountsSave.getPutStoreDate());
}
@ -157,6 +159,7 @@ public class OemStatementController extends BladeController {
@PostMapping("/approval")
@ApiOperationSupport(order = 11)
@Operation(summary = "外协结算批量审核", description = "")
@ApiLog("外协结算 审核")
public R approval(@Valid @RequestBody OemSettleAccountsApproval oemSettleAccountsApproval) {
return mesOemStatementService.approval(oemSettleAccountsApproval);
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/PlatingTypeRulesController.java
Unescape View File

@ -7,6 +7,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
@ -81,6 +82,7 @@ public class PlatingTypeRulesController extends BladeController {
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入mesPlatingTypeRules")
@ApiLog("外协镀种规则 新增")
public R save(@Valid @RequestBody PlatingTypeRulesEntity mesPlatingTypeRules) {
mesPlatingTypeRules.setCreateTime(new Date());
mesPlatingTypeRules.setCreateUser(AuthUtil.getUserId());
@ -93,6 +95,7 @@ public class PlatingTypeRulesController extends BladeController {
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入mesPlatingTypeRules")
@ApiLog("外协镀种规则 修改")
public R update(@Valid @RequestBody PlatingTypeRulesEntity mesPlatingTypeRules) {
mesPlatingTypeRules.setCreateTime(new Date());
return R.status(mesPlatingTypeRulesService.updateById(mesPlatingTypeRules));
@ -104,6 +107,7 @@ public class PlatingTypeRulesController extends BladeController {
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入mesPlatingTypeRules")
@ApiLog("外协镀种规则 新增或修改")
public R submit(@Valid @RequestBody PlatingTypeRulesEntity mesPlatingTypeRules) {
mesPlatingTypeRules.setCreateUser(AuthUtil.getUserId());
mesPlatingTypeRules.setCreateTime(new Date());
@ -116,6 +120,7 @@ public class PlatingTypeRulesController extends BladeController {
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@ApiLog("外协镀种规则 逻辑删除")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(mesPlatingTypeRulesService.deleteLogic(Func.toLongList(ids)));
}

Write Preview
Loading…
Cancel
Save