优化

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -43,6 +43,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -129,7 +131,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
      */
     @Override
     public int insertMydoJob(MydoJob mydoJob) {
-        mydoJob.setCreateTime(new Date());
+        //时间日期处理 新增
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = sdf.format(new Date());
+        ParsePosition pos = new ParsePosition(0);
+        mydoJob.setCreateTime(sdf.parse(date, pos));
         mydoJob.setJobId(basJobIdService.getJobId("RK"));
         mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1")));
         return mydoJobMapper.insertMydoJob(mydoJob);
@@ -455,12 +461,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
                 updateMydoJob(job);
                 insertHistory(jobId);
                 //通知wcs
-                AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
-                if (ajaxResult.isSuccess()){
-                    return AjaxResult.success();
-                }else {
-                    throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
-                }
+//                AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
+//                if (ajaxResult.isSuccess()){
+//                    return AjaxResult.success();
+//                }else {
+//                    throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
+//                }
             }
 
         } catch (Exception e) {
@@ -475,23 +481,18 @@ public class MydoJobServiceImpl implements IMydoJobService {
     public AjaxResult pointOut(String[] stockIds, String exitId) {
         HashMap<String, Object> map = new HashMap<>();
         String msg = "";
-        String Stringbuilder = "";
+        StringBuilder builder = new StringBuilder();
         for (String stockId : stockIds) {
             map.put("v_stock_id", stockId);
             map.put("v_exit_id", exitId);
             mydoJobMapper.pointOut(map);
-            iToWcsService.pushOutMydoJob();
-            String result = map.get("v_result").toString();
-            if (!"10".equals(result)) {
-                Stringbuilder += stockId + msg + "<br/>";
-            }
-
+            msg = map.get("v_resultmsg").toString();
+            builder.append("库存编号：" + stockId + "，分配结果：" + msg + "<br/>");
         }
-
-        if (!StrUtil.isEmpty(Stringbuilder)) {
-            return AjaxResult.warn(Stringbuilder);
+        iToWcsService.pushOutMydoJob();
+        if (!StrUtil.isEmpty(builder)) {
+            return AjaxResult.warn(builder.toString());
         }
-
         return AjaxResult.success();
     }
 

ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java

@@ -164,447 +164,358 @@ public class ViewHandAllotStock extends BaseEntity
     @Excel(name = "货位名称")
     private String cargoSpaceName;
 
-    private Integer thePlatoon;
-    private Integer theColumn;
-    private Integer theFloor;
+    @Excel(name = "排")
+    private String thePlatoon;
+    @Excel(name = "列")
+    private String theColumn;
+    @Excel(name = "层")
+    private String theFloor;
+    @Excel(name = "巷道")
+    private String roadwayId;
+    private String status;
+    private String locked;
 
-    public void setStockId(String stockId) 
-    {
-        this.stockId = stockId;
-    }
-
-    public String getStockId() 
-    {
+    public String getStockId() {
         return stockId;
     }
 
-    public void setCargoSpaceId(String cargoSpaceId) 
-    {
-        this.cargoSpaceId = cargoSpaceId;
+    public void setStockId(String stockId) {
+        this.stockId = stockId;
     }
 
-    public String getCargoSpaceId() 
-    {
+    public String getCargoSpaceId() {
         return cargoSpaceId;
     }
 
-    public void setStockStatus(String stockStatus) 
-    {
-        this.stockStatus = stockStatus;
+    public void setCargoSpaceId(String cargoSpaceId) {
+        this.cargoSpaceId = cargoSpaceId;
     }
 
-    public String getStockStatus() 
-    {
+    public String getStockStatus() {
         return stockStatus;
     }
 
-    public void setProductStatus(String productStatus) 
-    {
-        this.productStatus = productStatus;
+    public void setStockStatus(String stockStatus) {
+        this.stockStatus = stockStatus;
     }
 
-    public String getProductStatus() 
-    {
+    public String getProductStatus() {
         return productStatus;
     }
 
-    public void setLotNo(String lotNo) 
-    {
-        this.lotNo = lotNo;
+    public void setProductStatus(String productStatus) {
+        this.productStatus = productStatus;
     }
 
-    public String getLotNo() 
-    {
+    public String getLotNo() {
         return lotNo;
     }
 
-    public void setInDate(String inDate) 
-    {
-        this.inDate = inDate;
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
     }
 
-    public String getInDate() 
-    {
+    public String getInDate() {
         return inDate;
     }
 
-    public void setBackDate(String backDate) 
-    {
-        this.backDate = backDate;
+    public void setInDate(String inDate) {
+        this.inDate = inDate;
     }
 
-    public String getBackDate() 
-    {
+    public String getBackDate() {
         return backDate;
     }
 
-    public void setProductGuid(String productGuid) 
-    {
-        this.productGuid = productGuid;
+    public void setBackDate(String backDate) {
+        this.backDate = backDate;
     }
 
-    public String getProductGuid() 
-    {
+    public String getProductGuid() {
         return productGuid;
     }
 
-    public void setQuantity(BigDecimal quantity) 
-    {
-        this.quantity = quantity;
+    public void setProductGuid(String productGuid) {
+        this.productGuid = productGuid;
     }
 
-    public BigDecimal getQuantity() 
-    {
+    public BigDecimal getQuantity() {
         return quantity;
     }
 
-    public void setJobId(String jobId) 
-    {
-        this.jobId = jobId;
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
     }
 
-    public String getJobId() 
-    {
+    public String getJobId() {
         return jobId;
     }
 
-    public void setTrayCode(String trayCode) 
-    {
-        this.trayCode = trayCode;
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
     }
 
-    public String getTrayCode() 
-    {
+    public String getTrayCode() {
         return trayCode;
     }
 
-    public void setOutQuantity(String outQuantity) 
-    {
-        this.outQuantity = outQuantity;
+    public void setTrayCode(String trayCode) {
+        this.trayCode = trayCode;
     }
 
-    public String getOutQuantity() 
-    {
+    public String getOutQuantity() {
         return outQuantity;
     }
 
-    public void setStockinDetailId(String stockinDetailId) 
-    {
-        this.stockinDetailId = stockinDetailId;
+    public void setOutQuantity(String outQuantity) {
+        this.outQuantity = outQuantity;
     }
 
-    public String getStockinDetailId() 
-    {
+    public String getStockinDetailId() {
         return stockinDetailId;
     }
 
-    public void setStockinId(String stockinId) 
-    {
-        this.stockinId = stockinId;
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
     }
 
-    public String getStockinId() 
-    {
+    public String getStockinId() {
         return stockinId;
     }
 
-    public void setInType(String inType) 
-    {
-        this.inType = inType;
+    public void setStockinId(String stockinId) {
+        this.stockinId = stockinId;
     }
 
-    public String getInType() 
-    {
+    public String getInType() {
         return inType;
     }
 
-    public void setInClassId(String inClassId) 
-    {
-        this.inClassId = inClassId;
+    public void setInType(String inType) {
+        this.inType = inType;
     }
 
-    public String getInClassId() 
-    {
+    public String getInClassId() {
         return inClassId;
     }
 
-    public void setWarehouseId(String warehouseId) 
-    {
-        this.warehouseId = warehouseId;
+    public void setInClassId(String inClassId) {
+        this.inClassId = inClassId;
     }
 
-    public String getWarehouseId() 
-    {
+    public String getWarehouseId() {
         return warehouseId;
     }
 
-    public void setStackingId(String stackingId) 
-    {
-        this.stackingId = stackingId;
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
     }
 
-    public String getStackingId() 
-    {
+    public String getStackingId() {
         return stackingId;
     }
 
-    public void setSpare1(String spare1) 
-    {
-        this.spare1 = spare1;
+    public void setStackingId(String stackingId) {
+        this.stackingId = stackingId;
     }
 
-    public String getSpare1() 
-    {
+    public String getSpare1() {
         return spare1;
     }
 
-    public void setSpare2(String spare2) 
-    {
-        this.spare2 = spare2;
+    public void setSpare1(String spare1) {
+        this.spare1 = spare1;
     }
 
-    public String getSpare2() 
-    {
+    public String getSpare2() {
         return spare2;
     }
 
-    public void setSpare3(String spare3) 
-    {
-        this.spare3 = spare3;
+    public void setSpare2(String spare2) {
+        this.spare2 = spare2;
     }
 
-    public String getSpare3() 
-    {
+    public String getSpare3() {
         return spare3;
     }
 
-    public void setSpare4(String spare4) 
-    {
-        this.spare4 = spare4;
+    public void setSpare3(String spare3) {
+        this.spare3 = spare3;
     }
 
-    public String getSpare4() 
-    {
+    public String getSpare4() {
         return spare4;
     }
 
-    public void setSpare5(String spare5) 
-    {
-        this.spare5 = spare5;
+    public void setSpare4(String spare4) {
+        this.spare4 = spare4;
     }
 
-    public String getSpare5() 
-    {
+    public String getSpare5() {
         return spare5;
     }
 
-    public void setSpare6(String spare6) 
-    {
-        this.spare6 = spare6;
+    public void setSpare5(String spare5) {
+        this.spare5 = spare5;
     }
 
-    public String getSpare6() 
-    {
+    public String getSpare6() {
         return spare6;
     }
 
-    public void setProductId(String productId) 
-    {
-        this.productId = productId;
+    public void setSpare6(String spare6) {
+        this.spare6 = spare6;
     }
 
-    public String getProductId() 
-    {
+    public String getProductId() {
         return productId;
     }
 
-    public void setProductName(String productName) 
-    {
-        this.productName = productName;
+    public void setProductId(String productId) {
+        this.productId = productId;
     }
 
-    public String getProductName() 
-    {
+    public String getProductName() {
         return productName;
     }
 
-    public void setVoltage(String voltage) 
-    {
-        this.voltage = voltage;
+    public void setProductName(String productName) {
+        this.productName = productName;
     }
 
-    public String getVoltage() 
-    {
+    public String getVoltage() {
         return voltage;
     }
 
-    public void setPower(String power) 
-    {
-        this.power = power;
+    public void setVoltage(String voltage) {
+        this.voltage = voltage;
     }
 
-    public String getPower() 
-    {
+    public String getPower() {
         return power;
     }
 
-    public void setPhase(String phase) 
-    {
-        this.phase = phase;
+    public void setPower(String power) {
+        this.power = power;
     }
 
-    public String getPhase() 
-    {
+    public String getPhase() {
         return phase;
     }
 
-    public void setNetWeight(BigDecimal netWeight) 
-    {
-        this.netWeight = netWeight;
+    public void setPhase(String phase) {
+        this.phase = phase;
     }
 
-    public BigDecimal getNetWeight() 
-    {
+    public BigDecimal getNetWeight() {
         return netWeight;
     }
 
-    public void setGrossWeight(BigDecimal grossWeight) 
-    {
-        this.grossWeight = grossWeight;
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
     }
 
-    public BigDecimal getGrossWeight() 
-    {
+    public BigDecimal getGrossWeight() {
         return grossWeight;
     }
 
-    public void setDistribution(String distribution) 
-    {
-        this.distribution = distribution;
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
     }
 
-    public String getDistribution() 
-    {
+    public String getDistribution() {
         return distribution;
     }
 
-    public void setModel(String model) 
-    {
-        this.model = model;
+    public void setDistribution(String distribution) {
+        this.distribution = distribution;
     }
 
-    public String getModel() 
-    {
+    public String getModel() {
         return model;
     }
 
-    public void setOrderId(String orderId) 
-    {
-        this.orderId = orderId;
+    public void setModel(String model) {
+        this.model = model;
     }
 
-    public String getOrderId() 
-    {
+    public String getOrderId() {
         return orderId;
     }
 
-    public void setSpare7(String spare7) 
-    {
-        this.spare7 = spare7;
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
     }
 
-    public String getSpare7() 
-    {
+    public String getSpare7() {
         return spare7;
     }
 
-    public void setSpare8(String spare8) 
-    {
-        this.spare8 = spare8;
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
     }
 
-    public String getSpare8() 
-    {
+    public String getSpare8() {
         return spare8;
     }
 
-    public void setCargoSpaceName(String cargoSpaceName) 
-    {
-        this.cargoSpaceName = cargoSpaceName;
+    public void setSpare8(String spare8) {
+        this.spare8 = spare8;
     }
 
-    public String getCargoSpaceName() 
-    {
+    public String getCargoSpaceName() {
         return cargoSpaceName;
     }
 
-    public Integer getThePlatoon() {
+    public void setCargoSpaceName(String cargoSpaceName) {
+        this.cargoSpaceName = cargoSpaceName;
+    }
+
+    public String getThePlatoon() {
         return thePlatoon;
     }
 
-    public void setThePlatoon(Integer thePlatoon) {
+    public void setThePlatoon(String thePlatoon) {
         this.thePlatoon = thePlatoon;
     }
 
-    public Integer getTheColumn() {
+    public String getTheColumn() {
         return theColumn;
     }
 
-    public void setTheColumn(Integer theColumn) {
+    public void setTheColumn(String theColumn) {
         this.theColumn = theColumn;
     }
 
-    public Integer getTheFloor() {
+    public String getTheFloor() {
         return theFloor;
     }
 
-    public void setTheFloor(Integer theFloor) {
+    public void setTheFloor(String theFloor) {
         this.theFloor = theFloor;
     }
 
-    @Override
-    public String toString() {
-        return "ViewHandAllotStock{" +
-                "stockId='" + stockId + '\'' +
-                ", cargoSpaceId='" + cargoSpaceId + '\'' +
-                ", stockStatus='" + stockStatus + '\'' +
-                ", productStatus='" + productStatus + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", inDate='" + inDate + '\'' +
-                ", backDate='" + backDate + '\'' +
-                ", productGuid='" + productGuid + '\'' +
-                ", quantity=" + quantity +
-                ", jobId='" + jobId + '\'' +
-                ", trayCode='" + trayCode + '\'' +
-                ", outQuantity='" + outQuantity + '\'' +
-                ", stockinDetailId='" + stockinDetailId + '\'' +
-                ", stockinId='" + stockinId + '\'' +
-                ", inType='" + inType + '\'' +
-                ", inClassId='" + inClassId + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", stackingId='" + stackingId + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare3='" + spare3 + '\'' +
-                ", spare4='" + spare4 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", productId='" + productId + '\'' +
-                ", productName='" + productName + '\'' +
-                ", voltage='" + voltage + '\'' +
-                ", power='" + power + '\'' +
-                ", phase='" + phase + '\'' +
-                ", netWeight=" + netWeight +
-                ", grossWeight=" + grossWeight +
-                ", distribution='" + distribution + '\'' +
-                ", model='" + model + '\'' +
-                ", orderId='" + orderId + '\'' +
-                ", spare7='" + spare7 + '\'' +
-                ", spare8='" + spare8 + '\'' +
-                ", cargoSpaceName='" + cargoSpaceName + '\'' +
-                ", thePlatoon=" + thePlatoon +
-                ", theColumn=" + theColumn +
-                ", theFloor=" + theFloor +
-                '}';
+    public String getRoadwayId() {
+        return roadwayId;
+    }
+
+    public void setRoadwayId(String roadwayId) {
+        this.roadwayId = roadwayId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getLocked() {
+        return locked;
+    }
+
+    public void setLocked(String locked) {
+        this.locked = locked;
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java

@@ -288,4 +288,585 @@ public class ViewStockDetail extends BaseEntity
     @Excel(name = "描述")
     private String remark;
 
+    private String thePlatoon;
+    private String theColumn;
+    private String theFloor;
+    private String startTime;
+    private String finishTime;
+
+    public Long getOnlyIdentity() {
+        return onlyIdentity;
+    }
+
+    public void setOnlyIdentity(Long onlyIdentity) {
+        this.onlyIdentity = onlyIdentity;
+    }
+
+    public String getStockId() {
+        return stockId;
+    }
+
+    public void setStockId(String stockId) {
+        this.stockId = stockId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getCargoSpaceId() {
+        return cargoSpaceId;
+    }
+
+    public void setCargoSpaceId(String cargoSpaceId) {
+        this.cargoSpaceId = cargoSpaceId;
+    }
+
+    public String getCargoSpaceName() {
+        return cargoSpaceName;
+    }
+
+    public void setCargoSpaceName(String cargoSpaceName) {
+        this.cargoSpaceName = cargoSpaceName;
+    }
+
+    public String getTrayCode() {
+        return trayCode;
+    }
+
+    public void setTrayCode(String trayCode) {
+        this.trayCode = trayCode;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
+    }
+
+    public String getLotNo() {
+        return lotNo;
+    }
+
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
+    }
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getInDate() {
+        return inDate;
+    }
+
+    public void setInDate(String inDate) {
+        this.inDate = inDate;
+    }
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getStackingId() {
+        return stackingId;
+    }
+
+    public void setStackingId(String stackingId) {
+        this.stackingId = stackingId;
+    }
+
+    public String getRoadwayId() {
+        return roadwayId;
+    }
+
+    public void setRoadwayId(String roadwayId) {
+        this.roadwayId = roadwayId;
+    }
+
+    public String getCargoSpaceStatus() {
+        return cargoSpaceStatus;
+    }
+
+    public void setCargoSpaceStatus(String cargoSpaceStatus) {
+        this.cargoSpaceStatus = cargoSpaceStatus;
+    }
+
+    public String getStockStatus() {
+        return stockStatus;
+    }
+
+    public void setStockStatus(String stockStatus) {
+        this.stockStatus = stockStatus;
+    }
+
+    public String getProductStatus() {
+        return productStatus;
+    }
+
+    public void setProductStatus(String productStatus) {
+        this.productStatus = productStatus;
+    }
+
+    public String getLocked() {
+        return locked;
+    }
+
+    public void setLocked(String locked) {
+        this.locked = locked;
+    }
+
+    public String getProductGuid() {
+        return productGuid;
+    }
+
+    public void setProductGuid(String productGuid) {
+        this.productGuid = productGuid;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getCargoNo() {
+        return cargoNo;
+    }
+
+    public void setCargoNo(String cargoNo) {
+        this.cargoNo = cargoNo;
+    }
+
+    public String getSpare1() {
+        return spare1;
+    }
+
+    public void setSpare1(String spare1) {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare2() {
+        return spare2;
+    }
+
+    public void setSpare2(String spare2) {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare3() {
+        return spare3;
+    }
+
+    public void setSpare3(String spare3) {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare4() {
+        return spare4;
+    }
+
+    public void setSpare4(String spare4) {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare5() {
+        return spare5;
+    }
+
+    public void setSpare5(String spare5) {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare6() {
+        return spare6;
+    }
+
+    public void setSpare6(String spare6) {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare7() {
+        return spare7;
+    }
+
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare8() {
+        return spare8;
+    }
+
+    public void setSpare8(String spare8) {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare9() {
+        return spare9;
+    }
+
+    public void setSpare9(String spare9) {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare10() {
+        return spare10;
+    }
+
+    public void setSpare10(String spare10) {
+        this.spare10 = spare10;
+    }
+
+    public String getSpare11() {
+        return spare11;
+    }
+
+    public void setSpare11(String spare11) {
+        this.spare11 = spare11;
+    }
+
+    public String getSpare12() {
+        return spare12;
+    }
+
+    public void setSpare12(String spare12) {
+        this.spare12 = spare12;
+    }
+
+    public String getSpare13() {
+        return spare13;
+    }
+
+    public void setSpare13(String spare13) {
+        this.spare13 = spare13;
+    }
+
+    public String getSpare14() {
+        return spare14;
+    }
+
+    public void setSpare14(String spare14) {
+        this.spare14 = spare14;
+    }
+
+    public String getSpare15() {
+        return spare15;
+    }
+
+    public void setSpare15(String spare15) {
+        this.spare15 = spare15;
+    }
+
+    public String getSpare16() {
+        return spare16;
+    }
+
+    public void setSpare16(String spare16) {
+        this.spare16 = spare16;
+    }
+
+    public String getSpare17() {
+        return spare17;
+    }
+
+    public void setSpare17(String spare17) {
+        this.spare17 = spare17;
+    }
+
+    public String getSpare18() {
+        return spare18;
+    }
+
+    public void setSpare18(String spare18) {
+        this.spare18 = spare18;
+    }
+
+    public String getSpare19() {
+        return spare19;
+    }
+
+    public void setSpare19(String spare19) {
+        this.spare19 = spare19;
+    }
+
+    public String getSpare20() {
+        return spare20;
+    }
+
+    public void setSpare20(String spare20) {
+        this.spare20 = spare20;
+    }
+
+    public String getSpare21() {
+        return spare21;
+    }
+
+    public void setSpare21(String spare21) {
+        this.spare21 = spare21;
+    }
+
+    public String getSpare22() {
+        return spare22;
+    }
+
+    public void setSpare22(String spare22) {
+        this.spare22 = spare22;
+    }
+
+    public String getSpare23() {
+        return spare23;
+    }
+
+    public void setSpare23(String spare23) {
+        this.spare23 = spare23;
+    }
+
+    public String getSpare24() {
+        return spare24;
+    }
+
+    public void setSpare24(String spare24) {
+        this.spare24 = spare24;
+    }
+
+    public String getSpare25() {
+        return spare25;
+    }
+
+    public void setSpare25(String spare25) {
+        this.spare25 = spare25;
+    }
+
+    public String getSpare26() {
+        return spare26;
+    }
+
+    public void setSpare26(String spare26) {
+        this.spare26 = spare26;
+    }
+
+    public String getSpare27() {
+        return spare27;
+    }
+
+    public void setSpare27(String spare27) {
+        this.spare27 = spare27;
+    }
+
+    public String getSpare28() {
+        return spare28;
+    }
+
+    public void setSpare28(String spare28) {
+        this.spare28 = spare28;
+    }
+
+    public String getSpare29() {
+        return spare29;
+    }
+
+    public void setSpare29(String spare29) {
+        this.spare29 = spare29;
+    }
+
+    public String getSpare30() {
+        return spare30;
+    }
+
+    public void setSpare30(String spare30) {
+        this.spare30 = spare30;
+    }
+
+    public String getSpare31() {
+        return spare31;
+    }
+
+    public void setSpare31(String spare31) {
+        this.spare31 = spare31;
+    }
+
+    public String getSpare32() {
+        return spare32;
+    }
+
+    public void setSpare32(String spare32) {
+        this.spare32 = spare32;
+    }
+
+    public String getSpare33() {
+        return spare33;
+    }
+
+    public void setSpare33(String spare33) {
+        this.spare33 = spare33;
+    }
+
+    public String getSpare34() {
+        return spare34;
+    }
+
+    public void setSpare34(String spare34) {
+        this.spare34 = spare34;
+    }
+
+    public String getSpare35() {
+        return spare35;
+    }
+
+    public void setSpare35(String spare35) {
+        this.spare35 = spare35;
+    }
+
+    public String getSpare36() {
+        return spare36;
+    }
+
+    public void setSpare36(String spare36) {
+        this.spare36 = spare36;
+    }
+
+    public String getSpare37() {
+        return spare37;
+    }
+
+    public void setSpare37(String spare37) {
+        this.spare37 = spare37;
+    }
+
+    public String getSpare38() {
+        return spare38;
+    }
+
+    public void setSpare38(String spare38) {
+        this.spare38 = spare38;
+    }
+
+    public String getSpare39() {
+        return spare39;
+    }
+
+    public void setSpare39(String spare39) {
+        this.spare39 = spare39;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getThePlatoon() {
+        return thePlatoon;
+    }
+
+    public void setThePlatoon(String thePlatoon) {
+        this.thePlatoon = thePlatoon;
+    }
+
+    public String getTheColumn() {
+        return theColumn;
+    }
+
+    public void setTheColumn(String theColumn) {
+        this.theColumn = theColumn;
+    }
+
+    public String getTheFloor() {
+        return theFloor;
+    }
+
+    public void setTheFloor(String theFloor) {
+        this.theFloor = theFloor;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(String finishTime) {
+        this.finishTime = finishTime;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java

@@ -343,5 +343,662 @@ public class ViewStockinHistory extends BaseEntity
 //    @Excel(name = "仓库名称")
     private String warehouseName;
 
+    private String startTime;
+    private String finishTime;
 
+    public String getStockinGuid() {
+        return stockinGuid;
+    }
+
+    public void setStockinGuid(String stockinGuid) {
+        this.stockinGuid = stockinGuid;
+    }
+
+    public String getStockinId() {
+        return stockinId;
+    }
+
+    public void setStockinId(String stockinId) {
+        this.stockinId = stockinId;
+    }
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getInType() {
+        return inType;
+    }
+
+    public void setInType(String inType) {
+        this.inType = inType;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateManId() {
+        return createManId;
+    }
+
+    public void setCreateManId(String createManId) {
+        this.createManId = createManId;
+    }
+
+    public String getErpBill() {
+        return erpBill;
+    }
+
+    public void setErpBill(String erpBill) {
+        this.erpBill = erpBill;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getFinishDate() {
+        return finishDate;
+    }
+
+    public void setFinishDate(String finishDate) {
+        this.finishDate = finishDate;
+    }
+
+    public String getStockSource() {
+        return stockSource;
+    }
+
+    public void setStockSource(String stockSource) {
+        this.stockSource = stockSource;
+    }
+
+    public String getDepartmentNo() {
+        return departmentNo;
+    }
+
+    public void setDepartmentNo(String departmentNo) {
+        this.departmentNo = departmentNo;
+    }
+
+    public String getClassNo() {
+        return classNo;
+    }
+
+    public void setClassNo(String classNo) {
+        this.classNo = classNo;
+    }
+
+    public String getSupplierNo() {
+        return supplierNo;
+    }
+
+    public void setSupplierNo(String supplierNo) {
+        this.supplierNo = supplierNo;
+    }
+
+    public String getSimpleName() {
+        return simpleName;
+    }
+
+    public void setSimpleName(String simpleName) {
+        this.simpleName = simpleName;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactNumber() {
+        return contactNumber;
+    }
+
+    public void setContactNumber(String contactNumber) {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLotNo() {
+        return lotNo;
+    }
+
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getQuantityX() {
+        return quantityX;
+    }
+
+    public void setQuantityX(String quantityX) {
+        this.quantityX = quantityX;
+    }
+
+    public String getQuantityJ() {
+        return quantityJ;
+    }
+
+    public void setQuantityJ(String quantityJ) {
+        this.quantityJ = quantityJ;
+    }
+
+    public String getAssignNum() {
+        return assignNum;
+    }
+
+    public void setAssignNum(String assignNum) {
+        this.assignNum = assignNum;
+    }
+
+    public String getAssignNumX() {
+        return assignNumX;
+    }
+
+    public void setAssignNumX(String assignNumX) {
+        this.assignNumX = assignNumX;
+    }
+
+    public String getAssignNumJ() {
+        return assignNumJ;
+    }
+
+    public void setAssignNumJ(String assignNumJ) {
+        this.assignNumJ = assignNumJ;
+    }
+
+    public String getScanNum() {
+        return scanNum;
+    }
+
+    public void setScanNum(String scanNum) {
+        this.scanNum = scanNum;
+    }
+
+    public String getScanNumX() {
+        return scanNumX;
+    }
+
+    public void setScanNumX(String scanNumX) {
+        this.scanNumX = scanNumX;
+    }
+
+    public String getScanNumJ() {
+        return scanNumJ;
+    }
+
+    public void setScanNumJ(String scanNumJ) {
+        this.scanNumJ = scanNumJ;
+    }
+
+    public String getPrintDate() {
+        return printDate;
+    }
+
+    public void setPrintDate(String printDate) {
+        this.printDate = printDate;
+    }
+
+    public String getStockStatus() {
+        return stockStatus;
+    }
+
+    public void setStockStatus(String stockStatus) {
+        this.stockStatus = stockStatus;
+    }
+
+    public String getProductGuid() {
+        return productGuid;
+    }
+
+    public void setProductGuid(String productGuid) {
+        this.productGuid = productGuid;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getCargoNo() {
+        return cargoNo;
+    }
+
+    public void setCargoNo(String cargoNo) {
+        this.cargoNo = cargoNo;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getSpare1() {
+        return spare1;
+    }
+
+    public void setSpare1(String spare1) {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare2() {
+        return spare2;
+    }
+
+    public void setSpare2(String spare2) {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare3() {
+        return spare3;
+    }
+
+    public void setSpare3(String spare3) {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare4() {
+        return spare4;
+    }
+
+    public void setSpare4(String spare4) {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare5() {
+        return spare5;
+    }
+
+    public void setSpare5(String spare5) {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare6() {
+        return spare6;
+    }
+
+    public void setSpare6(String spare6) {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare7() {
+        return spare7;
+    }
+
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare8() {
+        return spare8;
+    }
+
+    public void setSpare8(String spare8) {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare9() {
+        return spare9;
+    }
+
+    public void setSpare9(String spare9) {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare10() {
+        return spare10;
+    }
+
+    public void setSpare10(String spare10) {
+        this.spare10 = spare10;
+    }
+
+    public String getSpare11() {
+        return spare11;
+    }
+
+    public void setSpare11(String spare11) {
+        this.spare11 = spare11;
+    }
+
+    public String getSpare12() {
+        return spare12;
+    }
+
+    public void setSpare12(String spare12) {
+        this.spare12 = spare12;
+    }
+
+    public String getSpare13() {
+        return spare13;
+    }
+
+    public void setSpare13(String spare13) {
+        this.spare13 = spare13;
+    }
+
+    public String getSpare14() {
+        return spare14;
+    }
+
+    public void setSpare14(String spare14) {
+        this.spare14 = spare14;
+    }
+
+    public String getSpare15() {
+        return spare15;
+    }
+
+    public void setSpare15(String spare15) {
+        this.spare15 = spare15;
+    }
+
+    public String getSpare16() {
+        return spare16;
+    }
+
+    public void setSpare16(String spare16) {
+        this.spare16 = spare16;
+    }
+
+    public String getSpare17() {
+        return spare17;
+    }
+
+    public void setSpare17(String spare17) {
+        this.spare17 = spare17;
+    }
+
+    public String getSpare18() {
+        return spare18;
+    }
+
+    public void setSpare18(String spare18) {
+        this.spare18 = spare18;
+    }
+
+    public String getSpare19() {
+        return spare19;
+    }
+
+    public void setSpare19(String spare19) {
+        this.spare19 = spare19;
+    }
+
+    public String getSpare20() {
+        return spare20;
+    }
+
+    public void setSpare20(String spare20) {
+        this.spare20 = spare20;
+    }
+
+    public String getSpare21() {
+        return spare21;
+    }
+
+    public void setSpare21(String spare21) {
+        this.spare21 = spare21;
+    }
+
+    public String getSpare22() {
+        return spare22;
+    }
+
+    public void setSpare22(String spare22) {
+        this.spare22 = spare22;
+    }
+
+    public String getSpare23() {
+        return spare23;
+    }
+
+    public void setSpare23(String spare23) {
+        this.spare23 = spare23;
+    }
+
+    public String getSpare24() {
+        return spare24;
+    }
+
+    public void setSpare24(String spare24) {
+        this.spare24 = spare24;
+    }
+
+    public String getSpare25() {
+        return spare25;
+    }
+
+    public void setSpare25(String spare25) {
+        this.spare25 = spare25;
+    }
+
+    public String getSpare26() {
+        return spare26;
+    }
+
+    public void setSpare26(String spare26) {
+        this.spare26 = spare26;
+    }
+
+    public String getSpare27() {
+        return spare27;
+    }
+
+    public void setSpare27(String spare27) {
+        this.spare27 = spare27;
+    }
+
+    public String getSpare28() {
+        return spare28;
+    }
+
+    public void setSpare28(String spare28) {
+        this.spare28 = spare28;
+    }
+
+    public String getSpare29() {
+        return spare29;
+    }
+
+    public void setSpare29(String spare29) {
+        this.spare29 = spare29;
+    }
+
+    public String getSpare30() {
+        return spare30;
+    }
+
+    public void setSpare30(String spare30) {
+        this.spare30 = spare30;
+    }
+
+    public String getSpare31() {
+        return spare31;
+    }
+
+    public void setSpare31(String spare31) {
+        this.spare31 = spare31;
+    }
+
+    public String getSpare32() {
+        return spare32;
+    }
+
+    public void setSpare32(String spare32) {
+        this.spare32 = spare32;
+    }
+
+    public String getSpare33() {
+        return spare33;
+    }
+
+    public void setSpare33(String spare33) {
+        this.spare33 = spare33;
+    }
+
+    public String getSpare34() {
+        return spare34;
+    }
+
+    public void setSpare34(String spare34) {
+        this.spare34 = spare34;
+    }
+
+    public String getSpare35() {
+        return spare35;
+    }
+
+    public void setSpare35(String spare35) {
+        this.spare35 = spare35;
+    }
+
+    public String getSpare36() {
+        return spare36;
+    }
+
+    public void setSpare36(String spare36) {
+        this.spare36 = spare36;
+    }
+
+    public String getSpare37() {
+        return spare37;
+    }
+
+    public void setSpare37(String spare37) {
+        this.spare37 = spare37;
+    }
+
+    public String getSpare38() {
+        return spare38;
+    }
+
+    public void setSpare38(String spare38) {
+        this.spare38 = spare38;
+    }
+
+    public String getSpare39() {
+        return spare39;
+    }
+
+    public void setSpare39(String spare39) {
+        this.spare39 = spare39;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(String finishTime) {
+        this.finishTime = finishTime;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java

@@ -284,5 +284,534 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "描述")
     private String remark;
 
+    private String startTime;
+    private String finishTime;
 
+    public String getStockoutId() {
+        return stockoutId;
+    }
+
+    public void setStockoutId(String stockoutId) {
+        this.stockoutId = stockoutId;
+    }
+
+    public String getStockoutDetailId() {
+        return stockoutDetailId;
+    }
+
+    public void setStockoutDetailId(String stockoutDetailId) {
+        this.stockoutDetailId = stockoutDetailId;
+    }
+
+    public String getOutType() {
+        return outType;
+    }
+
+    public void setOutType(String outType) {
+        this.outType = outType;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateManId() {
+        return createManId;
+    }
+
+    public void setCreateManId(String createManId) {
+        this.createManId = createManId;
+    }
+
+    public String getErpStockoutId() {
+        return erpStockoutId;
+    }
+
+    public void setErpStockoutId(String erpStockoutId) {
+        this.erpStockoutId = erpStockoutId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getExitId() {
+        return exitId;
+    }
+
+    public void setExitId(String exitId) {
+        this.exitId = exitId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public BigDecimal getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getAllotQuantity() {
+        return allotQuantity;
+    }
+
+    public void setAllotQuantity(BigDecimal allotQuantity) {
+        this.allotQuantity = allotQuantity;
+    }
+
+    public String getLotNo() {
+        return lotNo;
+    }
+
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
+    }
+
+    public String getStockoutSource() {
+        return stockoutSource;
+    }
+
+    public void setStockoutSource(String stockoutSource) {
+        this.stockoutSource = stockoutSource;
+    }
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public BigDecimal getAssignNum() {
+        return assignNum;
+    }
+
+    public void setAssignNum(BigDecimal assignNum) {
+        this.assignNum = assignNum;
+    }
+
+    public String getEntryid() {
+        return entryid;
+    }
+
+    public void setEntryid(String entryid) {
+        this.entryid = entryid;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getProductGuid() {
+        return productGuid;
+    }
+
+    public void setProductGuid(String productGuid) {
+        this.productGuid = productGuid;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getCargoNo() {
+        return cargoNo;
+    }
+
+    public void setCargoNo(String cargoNo) {
+        this.cargoNo = cargoNo;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getSpare1() {
+        return spare1;
+    }
+
+    public void setSpare1(String spare1) {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare2() {
+        return spare2;
+    }
+
+    public void setSpare2(String spare2) {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare3() {
+        return spare3;
+    }
+
+    public void setSpare3(String spare3) {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare4() {
+        return spare4;
+    }
+
+    public void setSpare4(String spare4) {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare5() {
+        return spare5;
+    }
+
+    public void setSpare5(String spare5) {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare6() {
+        return spare6;
+    }
+
+    public void setSpare6(String spare6) {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare7() {
+        return spare7;
+    }
+
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare8() {
+        return spare8;
+    }
+
+    public void setSpare8(String spare8) {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare9() {
+        return spare9;
+    }
+
+    public void setSpare9(String spare9) {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare10() {
+        return spare10;
+    }
+
+    public void setSpare10(String spare10) {
+        this.spare10 = spare10;
+    }
+
+    public String getSpare11() {
+        return spare11;
+    }
+
+    public void setSpare11(String spare11) {
+        this.spare11 = spare11;
+    }
+
+    public String getSpare12() {
+        return spare12;
+    }
+
+    public void setSpare12(String spare12) {
+        this.spare12 = spare12;
+    }
+
+    public String getSpare13() {
+        return spare13;
+    }
+
+    public void setSpare13(String spare13) {
+        this.spare13 = spare13;
+    }
+
+    public String getSpare14() {
+        return spare14;
+    }
+
+    public void setSpare14(String spare14) {
+        this.spare14 = spare14;
+    }
+
+    public String getSpare15() {
+        return spare15;
+    }
+
+    public void setSpare15(String spare15) {
+        this.spare15 = spare15;
+    }
+
+    public String getSpare16() {
+        return spare16;
+    }
+
+    public void setSpare16(String spare16) {
+        this.spare16 = spare16;
+    }
+
+    public String getSpare17() {
+        return spare17;
+    }
+
+    public void setSpare17(String spare17) {
+        this.spare17 = spare17;
+    }
+
+    public String getSpare18() {
+        return spare18;
+    }
+
+    public void setSpare18(String spare18) {
+        this.spare18 = spare18;
+    }
+
+    public String getSpare19() {
+        return spare19;
+    }
+
+    public void setSpare19(String spare19) {
+        this.spare19 = spare19;
+    }
+
+    public String getSpare20() {
+        return spare20;
+    }
+
+    public void setSpare20(String spare20) {
+        this.spare20 = spare20;
+    }
+
+    public String getSpare21() {
+        return spare21;
+    }
+
+    public void setSpare21(String spare21) {
+        this.spare21 = spare21;
+    }
+
+    public String getSpare22() {
+        return spare22;
+    }
+
+    public void setSpare22(String spare22) {
+        this.spare22 = spare22;
+    }
+
+    public String getSpare23() {
+        return spare23;
+    }
+
+    public void setSpare23(String spare23) {
+        this.spare23 = spare23;
+    }
+
+    public String getSpare24() {
+        return spare24;
+    }
+
+    public void setSpare24(String spare24) {
+        this.spare24 = spare24;
+    }
+
+    public String getSpare25() {
+        return spare25;
+    }
+
+    public void setSpare25(String spare25) {
+        this.spare25 = spare25;
+    }
+
+    public String getSpare26() {
+        return spare26;
+    }
+
+    public void setSpare26(String spare26) {
+        this.spare26 = spare26;
+    }
+
+    public String getSpare27() {
+        return spare27;
+    }
+
+    public void setSpare27(String spare27) {
+        this.spare27 = spare27;
+    }
+
+    public String getSpare28() {
+        return spare28;
+    }
+
+    public void setSpare28(String spare28) {
+        this.spare28 = spare28;
+    }
+
+    public String getSpare29() {
+        return spare29;
+    }
+
+    public void setSpare29(String spare29) {
+        this.spare29 = spare29;
+    }
+
+    public String getSpare30() {
+        return spare30;
+    }
+
+    public void setSpare30(String spare30) {
+        this.spare30 = spare30;
+    }
+
+    public String getSpare31() {
+        return spare31;
+    }
+
+    public void setSpare31(String spare31) {
+        this.spare31 = spare31;
+    }
+
+    public String getSpare32() {
+        return spare32;
+    }
+
+    public void setSpare32(String spare32) {
+        this.spare32 = spare32;
+    }
+
+    public String getSpare33() {
+        return spare33;
+    }
+
+    public void setSpare33(String spare33) {
+        this.spare33 = spare33;
+    }
+
+    public String getSpare34() {
+        return spare34;
+    }
+
+    public void setSpare34(String spare34) {
+        this.spare34 = spare34;
+    }
+
+    public String getSpare35() {
+        return spare35;
+    }
+
+    public void setSpare35(String spare35) {
+        this.spare35 = spare35;
+    }
+
+    public String getSpare36() {
+        return spare36;
+    }
+
+    public void setSpare36(String spare36) {
+        this.spare36 = spare36;
+    }
+
+    public String getSpare37() {
+        return spare37;
+    }
+
+    public void setSpare37(String spare37) {
+        this.spare37 = spare37;
+    }
+
+    public String getSpare38() {
+        return spare38;
+    }
+
+    public void setSpare38(String spare38) {
+        this.spare38 = spare38;
+    }
+
+    public String getSpare39() {
+        return spare39;
+    }
+
+    public void setSpare39(String spare39) {
+        this.spare39 = spare39;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(String finishTime) {
+        this.finishTime = finishTime;
+    }
 }