库存维护记录

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java

@@ -1,7 +1,10 @@
 package com.ruoyi.job.mydojob.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.job.mydojobfinish.service.IMydoJobFinishService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,11 +31,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2025-05-23
  */
 @RestController
-@RequestMapping("/job/mydoJob")
+@RequestMapping("/job/inmydoJob")
 public class InMydoJobController extends BaseController
 {
     @Autowired
     private IMydoJobService mydoJobService;
+    @Autowired
+    private IMydoJobFinishService mydoJobFinishService;
 
     /**
      * 查询任务表列表
@@ -42,7 +47,12 @@ public class InMydoJobController extends BaseController
     public TableDataInfo list(MydoJob mydoJob)
     {
         startPage();
-        List<MydoJob> list = mydoJobService.selectMydoJobList(mydoJob);
+        List<MydoJob> list = null;
+        if(Integer.parseInt(mydoJob.getStatus())<4) {
+            list = mydoJobService.selectMydoJobList(mydoJob);
+        }else{
+            list= mydoJobFinishService.selectMydoJobFinishListByMydoJob(mydoJob);
+        }
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java

@@ -34,10 +34,14 @@ public class MydoJob
     /** 供应商ID */
     @Excel(name = "供应商ID")
     private String supplierId;
+    @Excel(name = "供应商名称")
+    private String supplierName;
 
     /** 客户ID */
     @Excel(name = "客户ID")
     private String customerId;
+    @Excel(name = "客户名称")
+    private String customerName;
 
     /** 部门ID */
     @Excel(name = "部门ID")
@@ -54,6 +58,8 @@ public class MydoJob
     /** 货位ID */
     @Excel(name = "货位ID")
     private String cargoSpaceId;
+    @Excel(name = "货位名称")
+    private String cargoSpaceName;
 
     /** 目标巷道ID */
     @Excel(name = "目标巷道ID")
@@ -62,6 +68,8 @@ public class MydoJob
     /** 目标货位ID */
     @Excel(name = "目标货位ID")
     private String targetCargoSpaceId;
+    @Excel(name = "目标货位名称")
+    private String targetCargoSpaceName;
 
     /** 产线ID */
     @Excel(name = "产线ID")
@@ -110,6 +118,8 @@ public class MydoJob
     /** 仓库ID */
     @Excel(name = "仓库ID")
     private String warehouseId;
+    @Excel(name = "仓库名称")
+    private String warehouseName;
 
     /** 重分标记 */
     @Excel(name = "重分标记")
@@ -373,6 +383,40 @@ public class MydoJob
         return faultFlag;
     }
 
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getCargoSpaceName() {
+        return cargoSpaceName;
+    }
+
+    public void setCargoSpaceName(String cargoSpaceName) {
+        this.cargoSpaceName = cargoSpaceName;
+    }
+
+    public String getTargetCargoSpaceName() {
+        return targetCargoSpaceName;
+    }
+
+    public void setTargetCargoSpaceName(String targetCargoSpaceName) {
+        this.targetCargoSpaceName = targetCargoSpaceName;
+    }
+
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)