24-05-16 返修类型

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

@@ -988,7 +988,7 @@ public class DailyPlanController {
 
     @PostMapping("/startRework")
     public R startRework(@RequestBody ReworkRecord reworkRecord){
-        reworkRecordService.startRework(reworkRecord.getSeqNo(),reworkRecord.getSite(),reworkRecord.getCreateTime(),reworkRecord.getCreateBy());
+        reworkRecordService.startRework(reworkRecord.getSeqNo(),reworkRecord.getSite(),reworkRecord.getType(),reworkRecord.getCreateTime(),reworkRecord.getCreateBy());
         return R.ok("操作成功");
     }
 

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

@@ -145,6 +145,9 @@ public class ReworkRecord {
     private String createBy;
 
     private String orderNo;
+
+
+    private String type;
     
 }
 

src/main/java/com/heai/modules/production/service/ReworkRecordService.java

@@ -15,7 +15,7 @@ public interface ReworkRecordService extends IService<ReworkRecord> {
      * @author zelian_wu
      * date 2024/1/17
      */
-     void startRework(Integer seqNo, String site, Date createTime, String createBy);
+     void startRework(Integer seqNo, String site,String type, Date createTime, String createBy);
 
     /**
      * 查询返工返修单

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

@@ -27,7 +27,7 @@ public class ReworkRecordServiceImpl extends ServiceImpl<ReworkRecordMapper,Rewo
     private DailyPlanMapper dailyPlanMapper;
     @Override
     @Transactional
-    public void startRework(Integer seqNo, String site, Date createTime,String createBy) {
+    public void startRework(Integer seqNo, String site,String type, Date createTime,String createBy) {
         if (Objects.isNull(seqNo)){
             throw new RuntimeException("输入派工单号为空");
         }
@@ -52,7 +52,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"), "", "返工中", createTime, createBy,routing.getOrderNo());
+                new BigDecimal("0"), "", "返工中", createTime, createBy,routing.getOrderNo(),type);
         save(reworkRecord);
     }
 

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

@@ -96,7 +96,8 @@
         rw.rework_status,
         rw.create_time,
         rw.create_by,
-        rw.order_no
+        rw.order_no,
+        rw.type
         from so_rework_record rw
         <where>
             <if test="site != null and site != ''">
@@ -129,6 +130,9 @@
             <if test="reworkEndDate != null">
                 and create_time &lt;= #{reworkEndDate}
             </if>
+            <if test="type != null and type != ''">
+                and rw.type = #{type}
+            </if>
         </where>
     </select>
 </mapper>