返工返修

src/main/java/com/heai/modules/production/controller/DailyPlanController.java

@@ -1082,6 +1082,7 @@ public class DailyPlanController {
             throw new RuntimeException("未接收到参数");
         }
         reworkRecord.setReworkStatus("已结束");
+        reworkRecord.setReportingTime(new Date());
         reworkRecordService.updateById(reworkRecord);
         return R.ok("操作成功!");
     }

src/main/java/com/heai/modules/production/entity/ReworkRecord.java

@@ -151,6 +151,10 @@ public class ReworkRecord {
 
 
     private String originOperatorId;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date reportingTime;
     
 }
 

src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java

@@ -64,7 +64,7 @@ public class ReworkRecordServiceImpl extends ServiceImpl<ReworkRecordMapper,Rewo
                 routing.getQtyRequired(), new BigDecimal("0"), new BigDecimal("0"), new BigDecimal("0"),
                 new BigDecimal("0"), new BigDecimal("0"), new BigDecimal("0"), new BigDecimal("0"), new BigDecimal("0"),
                 new BigDecimal("0"), "", new BigDecimal("0"), "", new BigDecimal("0"),
-                new BigDecimal("0"), "", "返工中", new Date(), record.getCreateBy(),routing.getOrderNo(),record.getType(),routing.getOperatorId());
+                new BigDecimal("0"), "", "返工中", new Date(), record.getCreateBy(),routing.getOrderNo(),record.getType(),routing.getOperatorId(),null);
         save(reworkRecord);
     }
 
@@ -110,7 +110,7 @@ public class ReworkRecordServiceImpl extends ServiceImpl<ReworkRecordMapper,Rewo
         SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         List<SysRoleEntity> checkUserRole=dailyPlanMapper.checkUserRole(currentUser.getUserId(),"管理员");
         List<SysRoleEntity> checkUserRole2=dailyPlanMapper.checkUserRole(currentUser.getUserId(),"部门管理员");
-        if(checkUserRole.size()==0&&checkUserRole2.size()==0){
+        if(checkUserRole.isEmpty() && checkUserRole2.isEmpty()){
             throw new RuntimeException("该用户没有权限");
         }
         lambdaUpdate().eq(ReworkRecord::getReworkNo,reworkRecord.getReworkNo()).remove();
@@ -121,10 +121,9 @@ public class ReworkRecordServiceImpl extends ServiceImpl<ReworkRecordMapper,Rewo
         SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         List<SysRoleEntity> checkUserRole=dailyPlanMapper.checkUserRole(currentUser.getUserId(),"管理员");
         List<SysRoleEntity> checkUserRole2=dailyPlanMapper.checkUserRole(currentUser.getUserId(),"部门管理员");
-        if(checkUserRole.size()==0&&checkUserRole2.size()==0){
+        if(checkUserRole.isEmpty() && checkUserRole2.isEmpty()){
             throw new RuntimeException("该用户没有权限");
         }
-        baseMapper.cancelRework(reworkRecord
-        );
+        baseMapper.cancelRework(reworkRecord);
     }
 }

src/main/resources/mapper/production/ReworkRecordMapper.xml

@@ -45,7 +45,8 @@
             rw.rework_status,
             rw.create_time,
             rw.create_by,
-            rw.order_no
+            rw.order_no,
+            rw.reporting_time
         from so_rework_record rw
         <where>
             rw.rework_status = '返工中'
@@ -100,7 +101,8 @@
         rw.type,
         rw.origin_operator_id,
         dbo.Get_OperatorDesc(rw.site,rw.origin_operator_id) as originOperatorName,
-        ss.QtyApprove as qtyApprove
+        ss.QtyApprove as qtyApprove,
+        rw.reporting_time
         from so_rework_record rw
         left join SOScheduledRouting ss on rw.seq_no = ss.SeqNo and rw.site = ss.Site
         <where>
@@ -177,7 +179,8 @@
             cause_defect = '',
             readiness_time = 0,
             production_time = 0,
-            remark = ''
+            remark = '',
+            reporting_time = null
         where rework_no = #{reworkNo}
     </update>
 </mapper>