生产监控管理修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlanLog.java

@@ -1,5 +1,6 @@
 package org.springblade.desk.produce.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -50,4 +51,8 @@ public class WorkPlanLog extends BaseEntity {
 	@Schema(description = "现接收人")
 	private String receiveMan;
 
+	@TableField(exist = false)
+	@Schema(description = "调整人")
+	private String adjustName;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DisTaskingController.java

@@ -27,6 +27,8 @@ import org.springblade.desk.produce.pojo.vo.TaskCompleteVO;
 import org.springblade.desk.produce.service.IDisTaskingService;
 import org.springblade.desk.produce.service.IPdaSaveService;
 import org.springblade.desk.produce.service.IWorkPlanLogService;
+import org.springblade.system.cache.UserCache;
+import org.springblade.system.pojo.entity.User;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -84,7 +86,7 @@ public class DisTaskingController extends BladeController {
     @GetMapping("/getByCardNoByPlan")
     @ApiOperationSupport(order = 3)
     @Operation(summary = "报工调整列表", description = "传入cardNo")
-    public R getByCardNoByPlan(String cardNo) {
+    public R<List<ByCardNoByPlanVO>> getByCardNoByPlan(String cardNo) {
         if (StringUtils.isBlank(cardNo)) {
             return R.fail("流程卡号为空");
         }
@@ -95,7 +97,7 @@ public class DisTaskingController extends BladeController {
     @GetMapping("/queryByWpIdlLst")
     @ApiOperationSupport(order = 4)
     @Operation(summary = "报工调整详情", description = "传入wpId")
-    public R queryByWpIdlLst(Long wpId) {
+    public R<List<MakeRec>> queryByWpIdlLst(Long wpId) {
         if (wpId == null) {
             return R.fail("参数为空");
         }
@@ -107,7 +109,12 @@ public class DisTaskingController extends BladeController {
     @ApiOperationSupport(order = 5)
     @Operation(summary = "车间作业计划修改日志", description = "workPlanLog")
     public R<IPage<WorkPlanLog>> workPlanLogPage(WorkPlanLog workPlanLog, Query query) {
-        return R.data(workPlanLogService.page(Condition.getPage(query), Wrappers.lambdaQuery(workPlanLog)));
+        IPage<WorkPlanLog> workPlanLogIPage = workPlanLogService.page(Condition.getPage(query), Wrappers.lambdaQuery(workPlanLog));
+        workPlanLogIPage.getRecords().forEach(log -> {
+            User user = UserCache.getUser(log.getCreateUser());
+            log.setAdjustName(user != null ? user.getRealName() : "");
+        });
+        return R.data(workPlanLogIPage);
     }
     @PostMapping("/taskCompleteOrder")
     @ApiOperationSupport(order = 6)

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java

@@ -14,6 +14,7 @@ import org.springblade.desk.produce.pojo.dto.PlateAroundDto;
 import org.springblade.desk.produce.pojo.dto.SavePlateAroundDto;
 import org.springblade.desk.produce.pojo.entity.PlateAround;
 import org.springblade.desk.produce.pojo.entity.WorkPlan;
+import org.springblade.desk.produce.pojo.vo.AfterPlateInVO;
 import org.springblade.desk.produce.pojo.vo.PlateAroundVO;
 import org.springblade.desk.produce.service.IPlateAroundService;
 import org.springframework.web.bind.annotation.*;
@@ -48,7 +49,7 @@ public class PlateAroundController extends BladeController {
     @GetMapping("/getBeforePlatInCardNo")
     @ApiOperationSupport(order = 2)
     @Operation(summary = "扫描流程卡获取镀前入库数据", description = "传入cardNo")
-    public R getBeforePlatInCardNo(String cardNo) {
+    public R<WorkPlan> getBeforePlatInCardNo(String cardNo) {
         // todo 获取当前登录人班组
         List<Long> tsIds = new ArrayList<>();
         // 获取镀前入库数据
@@ -66,7 +67,7 @@ public class PlateAroundController extends BladeController {
     @GetMapping("/getBeforePlatOutCardNo")
     @ApiOperationSupport(order = 3)
     @Operation(summary = "扫描流程卡获取镀前出库数据", description = "传入cardNo")
-    public R getBeforePlatOutCardNo(String cardNo) {
+    public R<PlateAround> getBeforePlatOutCardNo(String cardNo) {
         // todo 获取当前登录人班组
         List<Long> tsIds = new ArrayList<>();
         PlateAround plateAround = plateAroundService.getBeforePlatOutCardNo(cardNo, tsIds);
@@ -79,7 +80,7 @@ public class PlateAroundController extends BladeController {
     @GetMapping("/getAfterPlatInCardNo")
     @ApiOperationSupport(order = 4)
     @Operation(summary = "扫描流程卡获取镀后数据", description = "传入cardNo")
-    public R getAfterPlatInCardNo(String cardNo) {
+    public R<AfterPlateInVO> getAfterPlatInCardNo(String cardNo) {
         // todo 获取当前登录人班组
         List<Long> tsIds = new ArrayList<>();
         return R.data(plateAroundService.getAfterPlatInCardNo(cardNo, tsIds));