diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java
index 7332236..fce6d1a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java
@@ -24,16 +24,16 @@ public class BasCargoSpace extends BaseEntity {
/** 货位id 主键 */
@TableId
/** 货位编码 */
- @Excel(name = "${bas.CargoSpace.cargoSpaceId}")
+ @Excel(name = "货位编码")
private String cargoSpaceId;
private String warehouseId;
/** 仓库名称（不允许为空） */
- @Excel(name = "${bas.CargoSpace.warehouseId}")
+// @Excel(name = "${bas.CargoSpace.warehouseId}")
private String warehouseName;
/** 巷道id（允许为空） */
-// @Excel(name = "${bas.CargoSpace.roadwayId}")
+ @Excel(name = "巷道id")
private String roadwayId;
/** 货区id（允许为空） */
@@ -49,36 +49,36 @@ public class BasCargoSpace extends BaseEntity {
private String theTypeName;
/** 货位名称（不允许为空） */
- @Excel(name = "${bas.CargoSpace.cargoSpaceName}")
+ @Excel(name = "货位名称")
private String cargoSpaceName;
/** 排（不允许为空） */
- @Excel(name = "${bas.CargoSpace.thePlatoon}")
+ @Excel(name = "排")
private Long thePlatoon;
/** 列（不允许为空） */
- @Excel(name = "${bas.CargoSpace.theColumn}")
+ @Excel(name = "列")
private Long theColumn;
/** 层（不允许为空） */
- @Excel(name = "${bas.CargoSpace.theFloor}")
+ @Excel(name = "层")
private Long theFloor;
/** 货位状态1空2满 */
- @Excel(name = "${bas.CargoSpace.status}",dictType = "cargo_space_status")
+ @Excel(name = "货位状态",dictType = "cargo_space_status")
private String status;
/** 是否锁定（不允许为空）
Y锁、N开 */
- @Excel(name = "${bas.CargoSpace.locked}",dictType = "cargo_space_lock_status")
+ @Excel(name = "是否锁定",dictType = "cargo_space_lock_status")
private String locked;
/** 托盘条码（允许为空） */
- @Excel(name = "${bas.CargoSpace.trayCode}")
+ @Excel(name = "托盘条码")
private String trayCode;
/** 货位高度 */
- @Excel(name = "${bas.CargoSpace.cargoHight}")
+// @Excel(name = "${bas.CargoSpace.cargoHight}")
private String cargoHight;
/** 是否双伸 Y N */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
index e4c002a..7c687b1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
@@ -11,6 +11,8 @@ import com.ruoyi.job.mydojob.domain.MydoJob;
import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish;
import com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper;
import com.ruoyi.kpi.service.KpiService;
+import com.ruoyi.stock.stock.domain.BasStock;
+import com.ruoyi.stock.stock.mapper.BasStockMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,6 +33,9 @@ public class KpiServiceImpl implements KpiService
@Autowired
private BasCargoSpaceMapper basCargoSpaceMapper;
+
+ @Autowired
+ private BasStockMapper basStockMapper;
/**
* 获取入库均匀分析数据
*
@@ -433,16 +438,23 @@ public class KpiServiceImpl implements KpiService
StringBuilder info = new StringBuilder();
// 拼接货位信息
- info.append(MessageUtils.message("kpi.spacePlan.CargoSpaceName")).append(space.getCargoSpaceName()).append("
");
- info.append(MessageUtils.message("kpi.spacePlan.TheTypeName")).append(space.getTheTypeName()).append("
");
- info.append(MessageUtils.message("kpi.spacePlan.Locked")).append("Y".equals(space.getLocked()) ? MessageUtils.message("kpi.spacePlan.Y") : MessageUtils.message("kpi.spacePlan.N")).append("
");
- info.append(MessageUtils.message("kpi.spacePlan.TrayCode")).append(space.getTrayCode() != null ? space.getTrayCode() : MessageUtils.message("kpi.spacePlan.W")).append("
");
- info.append(MessageUtils.message("kpi.spacePlan.CargoHight")).append(space.getCargoHight() != null ? space.getCargoHight() : MessageUtils.message("kpi.spacePlan.W")).append("
");
- info.append(MessageUtils.message("kpi.spacePlan.IssDouble")).append("Y".equals(space.getIssDouble()) ? MessageUtils.message("kpi.spacePlan.Y") : MessageUtils.message("kpi.spacePlan.N")).append("
");
+ info.append("货位名称：").append(space.getCargoSpaceName()).append("
");
+ info.append("是否锁定：").append("Y".equals(space.getLocked()) ? "是" : "否").append("
");
+ info.append("托盘条码：").append(space.getTrayCode() != null ? space.getTrayCode() : "无").append("
");
+
+ // 根据cargoSpaceId查询BasStock表，获取productId和productName
+ BasStock stockQuery = new BasStock();
+ stockQuery.setCargoSpaceId(space.getCargoSpaceId());
+ List stockList = basStockMapper.selectBasStockList(stockQuery);
+ if (!stockList.isEmpty()) {
+ BasStock stock = stockList.get(0);
+ info.append("物料编码：").append(stock.getProductId() != null ? stock.getProductId() : "无").append("
");
+ info.append("物料名称：").append(stock.getProductName() != null ? stock.getProductName() : "无").append("
");
+ }
response.put("msg", info.toString());
} else {
- response.put("msg", MessageUtils.message("kpi.spacePlan.msg"));
+ response.put("msg", "未找到货位信息");
}
return response;
@@ -453,20 +465,13 @@ public class KpiServiceImpl implements KpiService
Map res = new HashMap<>();
MydoJob mydoJobParam = new MydoJob();
mydoJobParam.setWarehouseId(warehouseId);
+ // 直接查询创建时间是否在startTime与endTime之间
mydoJobParam.setCreateLeftTime(startTime);
mydoJobParam.setCreateRightTime(endTime);
mydoJobParam.setInOut(inOut);
- List datesBetween = DateUtil.rangeToList(DateUtil.parseDate(mydoJobParam.getCreateLeftTime()), DateUtil.parseDate(mydoJobParam.getCreateRightTime()), DateField.DAY_OF_MONTH);
+ List datesBetween = DateUtil.rangeToList(DateUtil.parseDate(startTime), DateUtil.parseDate(endTime), DateField.DAY_OF_MONTH);
List list = mydoJobFinishMapper.selectMydoJobFinishListByMydoJob(mydoJobParam);
- // 根据inOut过滤数据
- list = list.stream()
- .filter(job -> {
- int inOrOut = Integer.parseInt(job.getInOrOut());
- return "1".equals(mydoJobParam.getInOut()) ? inOrOut < 20 : inOrOut >= 20;
- })
- .collect(Collectors.toList());
-
// 获取所有巷道ID（1和2）
List roadwayIds = Arrays.asList("1", "2");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
index e9b2169..7f5baf9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
@@ -25,6 +25,8 @@ public class StockSummary extends BaseEntity
// @Excel(name = "序号")
private Long onlyIdentity;
+ @Excel(name = "订单号")
+ private String orderId;
/** 物料编码 */
@Excel(name = "物料编码")
private String productId;
@@ -38,7 +40,7 @@ public class StockSummary extends BaseEntity
private String spec;
/** 单位 */
- @Excel(name = "单位")
+// @Excel(name = "单位")
private String unit;
/** 批号 */
@@ -47,7 +49,7 @@ public class StockSummary extends BaseEntity
/** 仓库 */
private String warehouseId;
- @Excel(name = "仓库")
+// @Excel(name = "仓库")
private String warehouseName;
@Excel(name = "货位")
@@ -63,7 +65,7 @@ public class StockSummary extends BaseEntity
/** 价格 */
- @Excel(name = "价格")
+// @Excel(name = "价格")
private String price;
/** 产品分类 */
@@ -237,9 +239,12 @@ public class StockSummary extends BaseEntity
+
+
/** 分组字段控制 */
private Boolean groupByProductId;
private Boolean groupByProductName;
+ private Boolean groupByOrderId;
private Boolean groupBySpec;
private Boolean groupByUnit;
private Boolean groupByLotNo;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
index 9058c99..0132339 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
@@ -1,10 +1,16 @@
package com.ruoyi.search.ViewInJobFlow.domain;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
+
/**
* 入库作业流水对象 view_in_job_flow
*
@@ -23,78 +29,46 @@ public class ViewInJobFlow extends BaseEntity
@Excel(name = "子作业ID")
private String jobDetailId;
- /** 状态 */
- @Excel(name = "状态")
- private String status;
+ /** 作业类型 */
+ @Excel(name = "作业类型",dictType = "in_job_type")
+ private String inOrOut;
/** 任务号 */
@Excel(name = "任务号")
private String taskNo;
- /** 托盘号 */
- @Excel(name = "托盘号")
- private String trayCode;
+ /** 订单号 */
+ @Excel(name = "订单号")
+ private String lineId;
+
+ /** 物料编码 */
+ @Excel(name = "物料编码")
+ private String productId;
+
+ /** 品名 */
+ @Excel(name = "物料名称")
+ private String productName;
/** 巷道ID */
@Excel(name = "巷道ID")
private String roadwayId;
- /** 货位ID */
- @Excel(name = "货位ID")
- private String cargoSpaceId;
-
/** 货位名称 */
@Excel(name = "货位名称")
private String cargoSpaceName;
- /** 排 */
- @Excel(name = "排")
- private Long thePlatoon;
-
- /** 列 */
- @Excel(name = "列")
- private Long theColumn;
-
- /** 层 */
- @Excel(name = "层")
- private Long theFloor;
-
- /** 优先级 */
- @Excel(name = "优先级")
- private Long priority;
-
- /** 执行阶段 */
- @Excel(name = "执行阶段")
- private String executionPhase;
-
- /** 作业类型 */
- @Excel(name = "作业类型")
- private String inOrOut;
+ /** 状态 */
+ @Excel(name = "状态",dictType = "mydo_job_status")
+ private String status;
/** 入口ID */
@Excel(name = "入口ID")
private String entranceId;
- /** 物料ID */
- @Excel(name = "物料ID")
- private String wlbh;
-
/** 批号 */
@Excel(name = "批号")
private String lotNo;
- /** 垛型ID */
- @Excel(name = "垛型ID")
- private String stackingId;
-
- /** 库存状态 */
- @Excel(name = "库存状态")
- private String stockStatus;
-
- /** 入库数量 */
- @Excel(name = "入库数量")
- private String inQuantity;
-
/** 单据ID */
@Excel(name = "单据ID")
private String inOrOutId;
@@ -103,28 +77,83 @@ public class ViewInJobFlow extends BaseEntity
@Excel(name = "子单据ID")
private String inOrOutDId;
+ /** 创建时间 */
+ @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @Override
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ /** 入库数量 */
+ @Excel(name = "入库数量")
+ private String inQuantity;
+
+ /** 托盘号 */
+// @Excel(name = "托盘号")
+ private String trayCode;
+
+ /** 货位ID */
+// @Excel(name = "货位ID")
+ private String cargoSpaceId;
+
+ /** 排 */
+// @Excel(name = "排")
+ private Long thePlatoon;
+
+ /** 列 */
+// @Excel(name = "列")
+ private Long theColumn;
+
+ /** 层 */
+// @Excel(name = "层")
+ private Long theFloor;
+
+ /** 优先级 */
+// @Excel(name = "优先级")
+ private Long priority;
+
+ /** 执行阶段 */
+// @Excel(name = "执行阶段")
+ private String executionPhase;
+
+ /** 物料ID */
+// @Excel(name = "物料ID")
+ private String wlbh;
+
+ /** 垛型ID */
+// @Excel(name = "垛型ID")
+ private String stackingId;
+
+ /** 库存状态 */
+// @Excel(name = "库存状态")
+ private String stockStatus;
+
/** 开始时间 */
- @Excel(name = "开始时间")
+// @Excel(name = "开始时间")
private String startTime;
/** 结束时间 */
- @Excel(name = "结束时间")
+// @Excel(name = "结束时间")
private String finishTime;
/** 仓库ID */
- @Excel(name = "仓库ID")
+// @Excel(name = "仓库ID")
private String warehouseId;
/** 物料GUID */
- @Excel(name = "物料GUID")
+// @Excel(name = "物料GUID")
private String productGuid;
- /** 品名 */
- @Excel(name = "品名")
- private String productId;
+
/** 产品分类 */
- @Excel(name = "产品分类")
+// @Excel(name = "产品分类")
private String parentId;
/** 品号描述 */
@@ -167,9 +196,7 @@ public class ViewInJobFlow extends BaseEntity
@Excel(name = "功率")
private String spare6;
- /** 品名 */
- @Excel(name = "品名")
- private String productName;
+
/** 相位 */
@Excel(name = "相位")
@@ -303,803 +330,682 @@ public class ViewInJobFlow extends BaseEntity
@Excel(name = "包装材积")
private String spare39;
- public void setJobId(String jobId)
- {
- this.jobId = jobId;
- }
+ @Excel(name = "描述")
+ private String remark;
- public String getJobId()
- {
+
+ public String getJobId() {
return jobId;
}
- public void setJobDetailId(String jobDetailId)
- {
- this.jobDetailId = jobDetailId;
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
}
- public String getJobDetailId()
- {
+ public String getJobDetailId() {
return jobDetailId;
}
- public void setStatus(String status)
- {
- this.status = status;
+ public void setJobDetailId(String jobDetailId) {
+ this.jobDetailId = jobDetailId;
}
- public String getStatus()
- {
- return status;
- }
-
- public void setTaskNo(String taskNo)
- {
- this.taskNo = taskNo;
- }
-
- public String getTaskNo()
- {
- return taskNo;
- }
-
- public void setTrayCode(String trayCode)
- {
- this.trayCode = trayCode;
- }
-
- public String getTrayCode()
- {
- return trayCode;
- }
-
- public void setRoadwayId(String roadwayId)
- {
- this.roadwayId = roadwayId;
- }
-
- public String getRoadwayId()
- {
- return roadwayId;
- }
-
- public void setCargoSpaceId(String cargoSpaceId)
- {
- this.cargoSpaceId = cargoSpaceId;
- }
-
- public String getCargoSpaceId()
- {
- return cargoSpaceId;
- }
-
- public void setCargoSpaceName(String cargoSpaceName)
- {
- this.cargoSpaceName = cargoSpaceName;
- }
-
- public String getCargoSpaceName()
- {
- return cargoSpaceName;
- }
-
- public void setThePlatoon(Long thePlatoon)
- {
- this.thePlatoon = thePlatoon;
- }
-
- public Long getThePlatoon()
- {
- return thePlatoon;
- }
-
- public void setTheColumn(Long theColumn)
- {
- this.theColumn = theColumn;
- }
-
- public Long getTheColumn()
- {
- return theColumn;
- }
-
- public void setTheFloor(Long theFloor)
- {
- this.theFloor = theFloor;
- }
-
- public Long getTheFloor()
- {
- return theFloor;
- }
-
- public void setPriority(Long priority)
- {
- this.priority = priority;
- }
-
- public Long getPriority()
- {
- return priority;
- }
-
- public void setExecutionPhase(String executionPhase)
- {
- this.executionPhase = executionPhase;
- }
-
- public String getExecutionPhase()
- {
- return executionPhase;
- }
-
- public void setInOrOut(String inOrOut)
- {
- this.inOrOut = inOrOut;
- }
-
- public String getInOrOut()
- {
+ public String getInOrOut() {
return inOrOut;
}
- public void setEntranceId(String entranceId)
- {
- this.entranceId = entranceId;
+ public void setInOrOut(String inOrOut) {
+ this.inOrOut = inOrOut;
}
- public String getEntranceId()
- {
- return entranceId;
+ public String getTaskNo() {
+ return taskNo;
}
- public void setWlbh(String wlbh)
- {
- this.wlbh = wlbh;
+ public void setTaskNo(String taskNo) {
+ this.taskNo = taskNo;
}
- public String getWlbh()
- {
- return wlbh;
+ public String getLineId() {
+ return lineId;
}
- public void setLotNo(String lotNo)
- {
- this.lotNo = lotNo;
+ public void setLineId(String lineId) {
+ this.lineId = lineId;
}
- public String getLotNo()
- {
- return lotNo;
- }
-
- public void setStackingId(String stackingId)
- {
- this.stackingId = stackingId;
- }
-
- public String getStackingId()
- {
- return stackingId;
- }
-
- public void setStockStatus(String stockStatus)
- {
- this.stockStatus = stockStatus;
- }
-
- public String getStockStatus()
- {
- return stockStatus;
- }
-
- public void setInQuantity(String inQuantity)
- {
- this.inQuantity = inQuantity;
- }
-
- public String getInQuantity()
- {
- return inQuantity;
- }
-
- public void setInOrOutId(String inOrOutId)
- {
- this.inOrOutId = inOrOutId;
- }
-
- public String getInOrOutId()
- {
- return inOrOutId;
- }
-
- public void setInOrOutDId(String inOrOutDId)
- {
- this.inOrOutDId = inOrOutDId;
- }
-
- public String getInOrOutDId()
- {
- return inOrOutDId;
- }
-
- public void setStartTime(String startTime)
- {
- this.startTime = startTime;
- }
-
- public String getStartTime()
- {
- return startTime;
- }
-
- public void setFinishTime(String finishTime)
- {
- this.finishTime = finishTime;
- }
-
- public String getFinishTime()
- {
- return finishTime;
- }
-
- public void setWarehouseId(String warehouseId)
- {
- this.warehouseId = warehouseId;
- }
-
- public String getWarehouseId()
- {
- return warehouseId;
- }
-
- public void setProductGuid(String productGuid)
- {
- this.productGuid = productGuid;
- }
-
- public String getProductGuid()
- {
- return productGuid;
- }
-
- public void setProductId(String productId)
- {
- this.productId = productId;
- }
-
- public String getProductId()
- {
+ public String getProductId() {
return productId;
}
- public void setParentId(String parentId)
- {
- this.parentId = parentId;
+ public void setProductId(String productId) {
+ this.productId = productId;
}
- public String getParentId()
- {
- return parentId;
- }
-
- public void setPrice(String price)
- {
- this.price = price;
- }
-
- public String getPrice()
- {
- return price;
- }
-
- public void setCargoNo(String cargoNo)
- {
- this.cargoNo = cargoNo;
- }
-
- public String getCargoNo()
- {
- return cargoNo;
- }
-
- public void setUnit(String unit)
- {
- this.unit = unit;
- }
-
- public String getUnit()
- {
- return unit;
- }
-
- public void setSpec(String spec)
- {
- this.spec = spec;
- }
-
- public String getSpec()
- {
- return spec;
- }
-
- public void setSpare1(String spare1)
- {
- this.spare1 = spare1;
- }
-
- public String getSpare1()
- {
- return spare1;
- }
-
- public void setSpare2(String spare2)
- {
- this.spare2 = spare2;
- }
-
- public String getSpare2()
- {
- return spare2;
- }
-
- public void setSpare3(String spare3)
- {
- this.spare3 = spare3;
- }
-
- public String getSpare3()
- {
- return spare3;
- }
-
- public void setSpare4(String spare4)
- {
- this.spare4 = spare4;
- }
-
- public String getSpare4()
- {
- return spare4;
- }
-
- public void setSpare5(String spare5)
- {
- this.spare5 = spare5;
- }
-
- public String getSpare5()
- {
- return spare5;
- }
-
- public void setSpare6(String spare6)
- {
- this.spare6 = spare6;
- }
-
- public String getSpare6()
- {
- return spare6;
- }
-
- public void setProductName(String productName)
- {
- this.productName = productName;
- }
-
- public String getProductName()
- {
+ public String getProductName() {
return productName;
}
- public void setSpare7(String spare7)
- {
- this.spare7 = spare7;
+ public void setProductName(String productName) {
+ this.productName = productName;
}
- public String getSpare7()
- {
+ public String getRoadwayId() {
+ return roadwayId;
+ }
+
+ public void setRoadwayId(String roadwayId) {
+ this.roadwayId = roadwayId;
+ }
+
+ public String getCargoSpaceName() {
+ return cargoSpaceName;
+ }
+
+ public void setCargoSpaceName(String cargoSpaceName) {
+ this.cargoSpaceName = cargoSpaceName;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getEntranceId() {
+ return entranceId;
+ }
+
+ public void setEntranceId(String entranceId) {
+ this.entranceId = entranceId;
+ }
+
+ public String getLotNo() {
+ return lotNo;
+ }
+
+ public void setLotNo(String lotNo) {
+ this.lotNo = lotNo;
+ }
+
+ public String getInOrOutId() {
+ return inOrOutId;
+ }
+
+ public void setInOrOutId(String inOrOutId) {
+ this.inOrOutId = inOrOutId;
+ }
+
+ public String getInOrOutDId() {
+ return inOrOutDId;
+ }
+
+ public void setInOrOutDId(String inOrOutDId) {
+ this.inOrOutDId = inOrOutDId;
+ }
+
+
+ public String getInQuantity() {
+ return inQuantity;
+ }
+
+ public void setInQuantity(String inQuantity) {
+ this.inQuantity = inQuantity;
+ }
+
+ public String getTrayCode() {
+ return trayCode;
+ }
+
+ public void setTrayCode(String trayCode) {
+ this.trayCode = trayCode;
+ }
+
+ public String getCargoSpaceId() {
+ return cargoSpaceId;
+ }
+
+ public void setCargoSpaceId(String cargoSpaceId) {
+ this.cargoSpaceId = cargoSpaceId;
+ }
+
+ public Long getThePlatoon() {
+ return thePlatoon;
+ }
+
+ public void setThePlatoon(Long thePlatoon) {
+ this.thePlatoon = thePlatoon;
+ }
+
+ public Long getTheColumn() {
+ return theColumn;
+ }
+
+ public void setTheColumn(Long theColumn) {
+ this.theColumn = theColumn;
+ }
+
+ public Long getTheFloor() {
+ return theFloor;
+ }
+
+ public void setTheFloor(Long theFloor) {
+ this.theFloor = theFloor;
+ }
+
+ public Long getPriority() {
+ return priority;
+ }
+
+ public void setPriority(Long priority) {
+ this.priority = priority;
+ }
+
+ public String getExecutionPhase() {
+ return executionPhase;
+ }
+
+ public void setExecutionPhase(String executionPhase) {
+ this.executionPhase = executionPhase;
+ }
+
+ public String getWlbh() {
+ return wlbh;
+ }
+
+ public void setWlbh(String wlbh) {
+ this.wlbh = wlbh;
+ }
+
+ public String getStackingId() {
+ return stackingId;
+ }
+
+ public void setStackingId(String stackingId) {
+ this.stackingId = stackingId;
+ }
+
+ public String getStockStatus() {
+ return stockStatus;
+ }
+
+ public void setStockStatus(String stockStatus) {
+ this.stockStatus = stockStatus;
+ }
+
+ 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;
+ }
+
+ public String getWarehouseId() {
+ return warehouseId;
+ }
+
+ public void setWarehouseId(String warehouseId) {
+ this.warehouseId = warehouseId;
+ }
+
+ 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 setSpare8(String spare8)
- {
- this.spare8 = spare8;
+ public void setSpare7(String spare7) {
+ this.spare7 = spare7;
}
- public String getSpare8()
- {
+ public String getSpare8() {
return spare8;
}
- public void setSpare9(String spare9)
- {
- this.spare9 = spare9;
+ public void setSpare8(String spare8) {
+ this.spare8 = spare8;
}
- public String getSpare9()
- {
+ public String getSpare9() {
return spare9;
}
- public void setSpare10(String spare10)
- {
- this.spare10 = spare10;
+ public void setSpare9(String spare9) {
+ this.spare9 = spare9;
}
- public String getSpare10()
- {
+ public String getSpare10() {
return spare10;
}
- public void setSpare11(String spare11)
- {
- this.spare11 = spare11;
+ public void setSpare10(String spare10) {
+ this.spare10 = spare10;
}
- public String getSpare11()
- {
+ public String getSpare11() {
return spare11;
}
- public void setSpare12(String spare12)
- {
- this.spare12 = spare12;
+ public void setSpare11(String spare11) {
+ this.spare11 = spare11;
}
- public String getSpare12()
- {
+ public String getSpare12() {
return spare12;
}
- public void setSpare13(String spare13)
- {
- this.spare13 = spare13;
+ public void setSpare12(String spare12) {
+ this.spare12 = spare12;
}
- public String getSpare13()
- {
+ public String getSpare13() {
return spare13;
}
- public void setSpare14(String spare14)
- {
- this.spare14 = spare14;
+ public void setSpare13(String spare13) {
+ this.spare13 = spare13;
}
- public String getSpare14()
- {
+ public String getSpare14() {
return spare14;
}
- public void setSpare15(String spare15)
- {
- this.spare15 = spare15;
+ public void setSpare14(String spare14) {
+ this.spare14 = spare14;
}
- public String getSpare15()
- {
+ public String getSpare15() {
return spare15;
}
- public void setSpare16(String spare16)
- {
- this.spare16 = spare16;
+ public void setSpare15(String spare15) {
+ this.spare15 = spare15;
}
- public String getSpare16()
- {
+ public String getSpare16() {
return spare16;
}
- public void setSpare17(String spare17)
- {
- this.spare17 = spare17;
+ public void setSpare16(String spare16) {
+ this.spare16 = spare16;
}
- public String getSpare17()
- {
+ public String getSpare17() {
return spare17;
}
- public void setSpare18(String spare18)
- {
- this.spare18 = spare18;
+ public void setSpare17(String spare17) {
+ this.spare17 = spare17;
}
- public String getSpare18()
- {
+ public String getSpare18() {
return spare18;
}
- public void setSpare19(String spare19)
- {
- this.spare19 = spare19;
+ public void setSpare18(String spare18) {
+ this.spare18 = spare18;
}
- public String getSpare19()
- {
+ public String getSpare19() {
return spare19;
}
- public void setSpare20(String spare20)
- {
- this.spare20 = spare20;
+ public void setSpare19(String spare19) {
+ this.spare19 = spare19;
}
- public String getSpare20()
- {
+ public String getSpare20() {
return spare20;
}
- public void setSpare21(String spare21)
- {
- this.spare21 = spare21;
+ public void setSpare20(String spare20) {
+ this.spare20 = spare20;
}
- public String getSpare21()
- {
+ public String getSpare21() {
return spare21;
}
- public void setSpare22(String spare22)
- {
- this.spare22 = spare22;
+ public void setSpare21(String spare21) {
+ this.spare21 = spare21;
}
- public String getSpare22()
- {
+ public String getSpare22() {
return spare22;
}
- public void setSpare23(String spare23)
- {
- this.spare23 = spare23;
+ public void setSpare22(String spare22) {
+ this.spare22 = spare22;
}
- public String getSpare23()
- {
+ public String getSpare23() {
return spare23;
}
- public void setSpare24(String spare24)
- {
- this.spare24 = spare24;
+ public void setSpare23(String spare23) {
+ this.spare23 = spare23;
}
- public String getSpare24()
- {
+ public String getSpare24() {
return spare24;
}
- public void setSpare25(String spare25)
- {
- this.spare25 = spare25;
+ public void setSpare24(String spare24) {
+ this.spare24 = spare24;
}
- public String getSpare25()
- {
+ public String getSpare25() {
return spare25;
}
- public void setSpare26(String spare26)
- {
- this.spare26 = spare26;
+ public void setSpare25(String spare25) {
+ this.spare25 = spare25;
}
- public String getSpare26()
- {
+ public String getSpare26() {
return spare26;
}
- public void setSpare27(String spare27)
- {
- this.spare27 = spare27;
+ public void setSpare26(String spare26) {
+ this.spare26 = spare26;
}
- public String getSpare27()
- {
+ public String getSpare27() {
return spare27;
}
- public void setSpare28(String spare28)
- {
- this.spare28 = spare28;
+ public void setSpare27(String spare27) {
+ this.spare27 = spare27;
}
- public String getSpare28()
- {
+ public String getSpare28() {
return spare28;
}
- public void setSpare29(String spare29)
- {
- this.spare29 = spare29;
+ public void setSpare28(String spare28) {
+ this.spare28 = spare28;
}
- public String getSpare29()
- {
+ public String getSpare29() {
return spare29;
}
- public void setSpare30(String spare30)
- {
- this.spare30 = spare30;
+ public void setSpare29(String spare29) {
+ this.spare29 = spare29;
}
- public String getSpare30()
- {
+ public String getSpare30() {
return spare30;
}
- public void setSpare31(String spare31)
- {
- this.spare31 = spare31;
+ public void setSpare30(String spare30) {
+ this.spare30 = spare30;
}
- public String getSpare31()
- {
+ public String getSpare31() {
return spare31;
}
- public void setSpare32(String spare32)
- {
- this.spare32 = spare32;
+ public void setSpare31(String spare31) {
+ this.spare31 = spare31;
}
- public String getSpare32()
- {
+ public String getSpare32() {
return spare32;
}
- public void setSpare33(String spare33)
- {
- this.spare33 = spare33;
+ public void setSpare32(String spare32) {
+ this.spare32 = spare32;
}
- public String getSpare33()
- {
+ public String getSpare33() {
return spare33;
}
- public void setSpare34(String spare34)
- {
- this.spare34 = spare34;
+ public void setSpare33(String spare33) {
+ this.spare33 = spare33;
}
- public String getSpare34()
- {
+ public String getSpare34() {
return spare34;
}
- public void setSpare35(String spare35)
- {
- this.spare35 = spare35;
+ public void setSpare34(String spare34) {
+ this.spare34 = spare34;
}
- public String getSpare35()
- {
+ public String getSpare35() {
return spare35;
}
- public void setSpare36(String spare36)
- {
- this.spare36 = spare36;
+ public void setSpare35(String spare35) {
+ this.spare35 = spare35;
}
- public String getSpare36()
- {
+ public String getSpare36() {
return spare36;
}
- public void setSpare37(String spare37)
- {
- this.spare37 = spare37;
+ public void setSpare36(String spare36) {
+ this.spare36 = spare36;
}
- public String getSpare37()
- {
+ public String getSpare37() {
return spare37;
}
- public void setSpare38(String spare38)
- {
- this.spare38 = spare38;
+ public void setSpare37(String spare37) {
+ this.spare37 = spare37;
}
- public String getSpare38()
- {
+ public String getSpare38() {
return spare38;
}
- public void setSpare39(String spare39)
- {
+ public void setSpare38(String spare38) {
+ this.spare38 = spare38;
+ }
+
+ public String getSpare39() {
+ return spare39;
+ }
+
+ public void setSpare39(String spare39) {
this.spare39 = spare39;
}
- public String getSpare39()
- {
- return spare39;
+ @Override
+ public String getRemark() {
+ return remark;
+ }
+
+ @Override
+ public void setRemark(String remark) {
+ this.remark = remark;
}
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("jobId", getJobId())
- .append("jobDetailId", getJobDetailId())
- .append("status", getStatus())
- .append("taskNo", getTaskNo())
- .append("trayCode", getTrayCode())
- .append("roadwayId", getRoadwayId())
- .append("cargoSpaceId", getCargoSpaceId())
- .append("cargoSpaceName", getCargoSpaceName())
- .append("thePlatoon", getThePlatoon())
- .append("theColumn", getTheColumn())
- .append("theFloor", getTheFloor())
- .append("priority", getPriority())
- .append("executionPhase", getExecutionPhase())
- .append("inOrOut", getInOrOut())
- .append("entranceId", getEntranceId())
- .append("wlbh", getWlbh())
- .append("lotNo", getLotNo())
- .append("stackingId", getStackingId())
- .append("stockStatus", getStockStatus())
- .append("inQuantity", getInQuantity())
- .append("inOrOutId", getInOrOutId())
- .append("inOrOutDId", getInOrOutDId())
- .append("createTime", getCreateTime())
- .append("startTime", getStartTime())
- .append("finishTime", getFinishTime())
- .append("warehouseId", getWarehouseId())
- .append("productGuid", getProductGuid())
- .append("productId", getProductId())
- .append("parentId", getParentId())
- .append("price", getPrice())
- .append("cargoNo", getCargoNo())
- .append("unit", getUnit())
- .append("spec", getSpec())
- .append("remark", getRemark())
- .append("spare1", getSpare1())
- .append("spare2", getSpare2())
- .append("spare3", getSpare3())
- .append("spare4", getSpare4())
- .append("spare5", getSpare5())
- .append("spare6", getSpare6())
- .append("productName", getProductName())
- .append("spare7", getSpare7())
- .append("spare8", getSpare8())
- .append("spare9", getSpare9())
- .append("spare10", getSpare10())
- .append("spare11", getSpare11())
- .append("spare12", getSpare12())
- .append("spare13", getSpare13())
- .append("spare14", getSpare14())
- .append("spare15", getSpare15())
- .append("spare16", getSpare16())
- .append("spare17", getSpare17())
- .append("spare18", getSpare18())
- .append("spare19", getSpare19())
- .append("spare20", getSpare20())
- .append("spare21", getSpare21())
- .append("spare22", getSpare22())
- .append("spare23", getSpare23())
- .append("spare24", getSpare24())
- .append("spare25", getSpare25())
- .append("spare26", getSpare26())
- .append("spare27", getSpare27())
- .append("spare28", getSpare28())
- .append("spare29", getSpare29())
- .append("spare30", getSpare30())
- .append("spare31", getSpare31())
- .append("spare32", getSpare32())
- .append("spare33", getSpare33())
- .append("spare34", getSpare34())
- .append("spare35", getSpare35())
- .append("spare36", getSpare36())
- .append("spare37", getSpare37())
- .append("spare38", getSpare38())
- .append("spare39", getSpare39())
- .toString();
+ return "ViewInJobFlow{" +
+ "jobId='" + jobId + '\'' +
+ ", jobDetailId='" + jobDetailId + '\'' +
+ ", inOrOut='" + inOrOut + '\'' +
+ ", taskNo='" + taskNo + '\'' +
+ ", lineId='" + lineId + '\'' +
+ ", productId='" + productId + '\'' +
+ ", productName='" + productName + '\'' +
+ ", roadwayId='" + roadwayId + '\'' +
+ ", cargoSpaceName='" + cargoSpaceName + '\'' +
+ ", status='" + status + '\'' +
+ ", entranceId='" + entranceId + '\'' +
+ ", lotNo='" + lotNo + '\'' +
+ ", inOrOutId='" + inOrOutId + '\'' +
+ ", inOrOutDId='" + inOrOutDId + '\'' +
+ ", inQuantity='" + inQuantity + '\'' +
+ ", trayCode='" + trayCode + '\'' +
+ ", cargoSpaceId='" + cargoSpaceId + '\'' +
+ ", thePlatoon=" + thePlatoon +
+ ", theColumn=" + theColumn +
+ ", theFloor=" + theFloor +
+ ", priority=" + priority +
+ ", executionPhase='" + executionPhase + '\'' +
+ ", wlbh='" + wlbh + '\'' +
+ ", stackingId='" + stackingId + '\'' +
+ ", stockStatus='" + stockStatus + '\'' +
+ ", startTime='" + startTime + '\'' +
+ ", finishTime='" + finishTime + '\'' +
+ ", warehouseId='" + warehouseId + '\'' +
+ ", productGuid='" + productGuid + '\'' +
+ ", parentId='" + parentId + '\'' +
+ ", price='" + price + '\'' +
+ ", cargoNo='" + cargoNo + '\'' +
+ ", unit='" + unit + '\'' +
+ ", spec='" + spec + '\'' +
+ ", spare1='" + spare1 + '\'' +
+ ", spare2='" + spare2 + '\'' +
+ ", spare3='" + spare3 + '\'' +
+ ", spare4='" + spare4 + '\'' +
+ ", spare5='" + spare5 + '\'' +
+ ", spare6='" + spare6 + '\'' +
+ ", spare7='" + spare7 + '\'' +
+ ", spare8='" + spare8 + '\'' +
+ ", spare9='" + spare9 + '\'' +
+ ", spare10='" + spare10 + '\'' +
+ ", spare11='" + spare11 + '\'' +
+ ", spare12='" + spare12 + '\'' +
+ ", spare13='" + spare13 + '\'' +
+ ", spare14='" + spare14 + '\'' +
+ ", spare15='" + spare15 + '\'' +
+ ", spare16='" + spare16 + '\'' +
+ ", spare17='" + spare17 + '\'' +
+ ", spare18='" + spare18 + '\'' +
+ ", spare19='" + spare19 + '\'' +
+ ", spare20='" + spare20 + '\'' +
+ ", spare21='" + spare21 + '\'' +
+ ", spare22='" + spare22 + '\'' +
+ ", spare23='" + spare23 + '\'' +
+ ", spare24='" + spare24 + '\'' +
+ ", spare25='" + spare25 + '\'' +
+ ", spare26='" + spare26 + '\'' +
+ ", spare27='" + spare27 + '\'' +
+ ", spare28='" + spare28 + '\'' +
+ ", spare29='" + spare29 + '\'' +
+ ", spare30='" + spare30 + '\'' +
+ ", spare31='" + spare31 + '\'' +
+ ", spare32='" + spare32 + '\'' +
+ ", spare33='" + spare33 + '\'' +
+ ", spare34='" + spare34 + '\'' +
+ ", spare35='" + spare35 + '\'' +
+ ", spare36='" + spare36 + '\'' +
+ ", spare37='" + spare37 + '\'' +
+ ", spare38='" + spare38 + '\'' +
+ ", spare39='" + spare39 + '\'' +
+ ", remark='" + remark + '\'' +
+ '}';
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
index ed63d8b..59a2288 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
@@ -1,10 +1,13 @@
package com.ruoyi.search.ViewOutJobFlow.domain;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
+
/**
* 出库作业流水对象 view_out_job_flow
*
@@ -23,14 +26,26 @@ public class ViewOutJobFlow extends BaseEntity
@Excel(name = "子作业ID")
private String jobDetailId;
- /** 状态 */
- @Excel(name = "状态")
- private String status;
+ /** 作业类型 */
+ @Excel(name = "作业类型",dictType = "out_job_type")
+ private String inOrOut;
/** 任务号 */
@Excel(name = "任务号")
private String taskNo;
+ /** 订单号 */
+ @Excel(name = "订单号")
+ private String lineId;
+
+ /** 物料编码 */
+ @Excel(name = "物料编码")
+ private String productId;
+
+ /** 品名 */
+ @Excel(name = "物料名称")
+ private String productName;
+
/** 托盘码 */
@Excel(name = "托盘码")
private String trayCode;
@@ -39,66 +54,22 @@ public class ViewOutJobFlow extends BaseEntity
@Excel(name = "巷道ID")
private String roadwayId;
- /** 货位ID */
- @Excel(name = "货位ID")
- private String cargoSpaceId;
-
/** 货位名称 */
@Excel(name = "货位名称")
private String cargoSpaceName;
- /** 排 */
- @Excel(name = "排")
- private Long thePlatoon;
-
- /** 列 */
- @Excel(name = "列")
- private Long theColumn;
-
- /** 层 */
- @Excel(name = "层")
- private Long theFloor;
-
- /** 优先级 */
- @Excel(name = "优先级")
- private Long priority;
-
- /** 执行阶段 */
- @Excel(name = "执行阶段")
- private String executionPhase;
-
- /** 作业类型 */
- @Excel(name = "作业类型")
- private String inOrOut;
+ /** 状态 */
+ @Excel(name = "状态",dictType = "mydo_job_status")
+ private String status;
/** 出口ID */
@Excel(name = "出口ID")
private String exitId;
- /** 物料ID */
- @Excel(name = "物料ID")
- private String wlbh;
-
/** 批号 */
@Excel(name = "批号")
private String lotNo;
- /** 剁型ID */
- @Excel(name = "剁型ID")
- private String stackingId;
-
- /** 库存状态 */
- @Excel(name = "库存状态")
- private String stockStatus;
-
- /** 出库数量 */
- @Excel(name = "出库数量")
- private String outQuantity;
-
- /** 回流数量 */
- @Excel(name = "回流数量")
- private String giveNum;
-
/** 单据ID */
@Excel(name = "单据ID")
private String inOrOutId;
@@ -107,28 +78,76 @@ public class ViewOutJobFlow extends BaseEntity
@Excel(name = "子单据ID")
private String inOrOutDId;
+ /** 创建时间 */
+ @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /** 出库数量 */
+ @Excel(name = "出库数量")
+ private String outQuantity;
+
+ /** 客户名称 */
+ @Excel(name = "客户名称")
+ private String customerName;
+
+ /** 货位ID */
+// @Excel(name = "货位ID")
+ private String cargoSpaceId;
+
+ /** 排 */
+// @Excel(name = "排")
+ private Long thePlatoon;
+
+ /** 列 */
+// @Excel(name = "列")
+ private Long theColumn;
+
+ /** 层 */
+// @Excel(name = "层")
+ private Long theFloor;
+
+ /** 优先级 */
+// @Excel(name = "优先级")
+ private Long priority;
+
+ /** 执行阶段 */
+// @Excel(name = "执行阶段")
+ private String executionPhase;
+
+ /** 物料ID */
+// @Excel(name = "物料ID")
+ private String wlbh;
+
+ /** 剁型ID */
+// @Excel(name = "剁型ID")
+ private String stackingId;
+
+ /** 库存状态 */
+// @Excel(name = "库存状态")
+ private String stockStatus;
+
+ /** 回流数量 */
+// @Excel(name = "回流数量")
+ private String giveNum;
+
/** 开始时间 */
- @Excel(name = "开始时间")
+// @Excel(name = "开始时间")
private String startTime;
/** 结束时间 */
- @Excel(name = "结束时间")
+// @Excel(name = "结束时间")
private String finishTime;
/** 仓库ID */
- @Excel(name = "仓库ID")
+// @Excel(name = "仓库ID")
private String warehouseId;
/** 物料GUID */
- @Excel(name = "物料GUID")
+// @Excel(name = "物料GUID")
private String productGuid;
- /** 品号 */
- @Excel(name = "品号")
- private String productId;
-
/** 产品分类 */
- @Excel(name = "产品分类")
+// @Excel(name = "产品分类")
private String parentId;
/** 品号描述 */
@@ -148,39 +167,35 @@ public class ViewOutJobFlow extends BaseEntity
private String spec;
/** 型号 */
- @Excel(name = "型号")
+// @Excel(name = "型号")
private String spare1;
/** 单件净重 */
- @Excel(name = "单件净重")
+// @Excel(name = "单件净重")
private String spare2;
/** 颜色 */
- @Excel(name = "颜色")
+// @Excel(name = "颜色")
private String spare3;
/** 序列号 */
- @Excel(name = "序列号")
+// @Excel(name = "序列号")
private String spare4;
/** 电压 */
- @Excel(name = "电压")
+// @Excel(name = "电压")
private String spare5;
/** 功率 */
- @Excel(name = "功率")
+// @Excel(name = "功率")
private String spare6;
- /** 品名 */
- @Excel(name = "品名")
- private String productName;
-
/** 相位 */
- @Excel(name = "相位")
+// @Excel(name = "相位")
private String spare7;
/** 毛重 */
- @Excel(name = "毛重")
+// @Excel(name = "毛重")
private String spare8;
/** NC号 */
@@ -307,829 +322,710 @@ public class ViewOutJobFlow extends BaseEntity
@Excel(name = "包装材积")
private String spare39;
- /** 客户名称 */
- @Excel(name = "客户名称")
- private String customerName;
+ /** 描述 */
+ @Excel(name = "描述")
+ private String remark;
- public void setJobId(String jobId)
- {
- this.jobId = jobId;
- }
- public String getJobId()
- {
+
+ public String getJobId() {
return jobId;
}
- public void setJobDetailId(String jobDetailId)
- {
- this.jobDetailId = jobDetailId;
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
}
- public String getJobDetailId()
- {
+ public String getJobDetailId() {
return jobDetailId;
}
- public void setStatus(String status)
- {
- this.status = status;
+ public void setJobDetailId(String jobDetailId) {
+ this.jobDetailId = jobDetailId;
}
- public String getStatus()
- {
+ public String getStatus() {
return status;
}
- public void setTaskNo(String taskNo)
- {
- this.taskNo = taskNo;
+ public void setStatus(String status) {
+ this.status = status;
}
- public String getTaskNo()
- {
+ public String getTaskNo() {
return taskNo;
}
- public void setTrayCode(String trayCode)
- {
- this.trayCode = trayCode;
+ public void setTaskNo(String taskNo) {
+ this.taskNo = taskNo;
}
- public String getTrayCode()
- {
+ public String getTrayCode() {
return trayCode;
}
- public void setRoadwayId(String roadwayId)
- {
- this.roadwayId = roadwayId;
+ public void setTrayCode(String trayCode) {
+ this.trayCode = trayCode;
}
- public String getRoadwayId()
- {
+ public String getRoadwayId() {
return roadwayId;
}
- public void setCargoSpaceId(String cargoSpaceId)
- {
- this.cargoSpaceId = cargoSpaceId;
+ public void setRoadwayId(String roadwayId) {
+ this.roadwayId = roadwayId;
}
- public String getCargoSpaceId()
- {
+ public String getCargoSpaceId() {
return cargoSpaceId;
}
- public void setCargoSpaceName(String cargoSpaceName)
- {
- this.cargoSpaceName = cargoSpaceName;
+ public void setCargoSpaceId(String cargoSpaceId) {
+ this.cargoSpaceId = cargoSpaceId;
}
- public String getCargoSpaceName()
- {
+ public String getCargoSpaceName() {
return cargoSpaceName;
}
- public void setThePlatoon(Long thePlatoon)
- {
- this.thePlatoon = thePlatoon;
+ public void setCargoSpaceName(String cargoSpaceName) {
+ this.cargoSpaceName = cargoSpaceName;
}
- public Long getThePlatoon()
- {
+ public Long getThePlatoon() {
return thePlatoon;
}
- public void setTheColumn(Long theColumn)
- {
- this.theColumn = theColumn;
+ public void setThePlatoon(Long thePlatoon) {
+ this.thePlatoon = thePlatoon;
}
- public Long getTheColumn()
- {
+ public Long getTheColumn() {
return theColumn;
}
- public void setTheFloor(Long theFloor)
- {
- this.theFloor = theFloor;
+ public void setTheColumn(Long theColumn) {
+ this.theColumn = theColumn;
}
- public Long getTheFloor()
- {
+ public Long getTheFloor() {
return theFloor;
}
- public void setPriority(Long priority)
- {
- this.priority = priority;
+ public void setTheFloor(Long theFloor) {
+ this.theFloor = theFloor;
}
- public Long getPriority()
- {
+ public Long getPriority() {
return priority;
}
- public void setExecutionPhase(String executionPhase)
- {
- this.executionPhase = executionPhase;
+ public void setPriority(Long priority) {
+ this.priority = priority;
}
- public String getExecutionPhase()
- {
+ public String getExecutionPhase() {
return executionPhase;
}
- public void setInOrOut(String inOrOut)
- {
- this.inOrOut = inOrOut;
+ public void setExecutionPhase(String executionPhase) {
+ this.executionPhase = executionPhase;
}
- public String getInOrOut()
- {
+ public String getInOrOut() {
return inOrOut;
}
- public void setExitId(String exitId)
- {
- this.exitId = exitId;
+ public void setInOrOut(String inOrOut) {
+ this.inOrOut = inOrOut;
}
- public String getExitId()
- {
+ public String getExitId() {
return exitId;
}
- public void setWlbh(String wlbh)
- {
- this.wlbh = wlbh;
+ public void setExitId(String exitId) {
+ this.exitId = exitId;
}
- public String getWlbh()
- {
+ public String getWlbh() {
return wlbh;
}
- public void setLotNo(String lotNo)
- {
- this.lotNo = lotNo;
+ public void setWlbh(String wlbh) {
+ this.wlbh = wlbh;
}
- public String getLotNo()
- {
+ public String getLotNo() {
return lotNo;
}
- public void setStackingId(String stackingId)
- {
- this.stackingId = stackingId;
+ public void setLotNo(String lotNo) {
+ this.lotNo = lotNo;
}
- public String getStackingId()
- {
+ public String getStackingId() {
return stackingId;
}
- public void setStockStatus(String stockStatus)
- {
- this.stockStatus = stockStatus;
+ public void setStackingId(String stackingId) {
+ this.stackingId = stackingId;
}
- public String getStockStatus()
- {
+ public String getStockStatus() {
return stockStatus;
}
- public void setOutQuantity(String outQuantity)
- {
- this.outQuantity = outQuantity;
+ public void setStockStatus(String stockStatus) {
+ this.stockStatus = stockStatus;
}
- public String getOutQuantity()
- {
+ public String getOutQuantity() {
return outQuantity;
}
- public void setGiveNum(String giveNum)
- {
- this.giveNum = giveNum;
+ public void setOutQuantity(String outQuantity) {
+ this.outQuantity = outQuantity;
}
- public String getGiveNum()
- {
+ public String getGiveNum() {
return giveNum;
}
- public void setInOrOutId(String inOrOutId)
- {
- this.inOrOutId = inOrOutId;
+ public void setGiveNum(String giveNum) {
+ this.giveNum = giveNum;
}
- public String getInOrOutId()
- {
+ public String getInOrOutId() {
return inOrOutId;
}
- public void setInOrOutDId(String inOrOutDId)
- {
- this.inOrOutDId = inOrOutDId;
+ public void setInOrOutId(String inOrOutId) {
+ this.inOrOutId = inOrOutId;
}
- public String getInOrOutDId()
- {
+ public String getInOrOutDId() {
return inOrOutDId;
}
- public void setStartTime(String startTime)
- {
- this.startTime = startTime;
+ public void setInOrOutDId(String inOrOutDId) {
+ this.inOrOutDId = inOrOutDId;
}
- public String getStartTime()
- {
+ public String getStartTime() {
return startTime;
}
- public void setFinishTime(String finishTime)
- {
- this.finishTime = finishTime;
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
}
- public String getFinishTime()
- {
+ public String getFinishTime() {
return finishTime;
}
- public void setWarehouseId(String warehouseId)
- {
- this.warehouseId = warehouseId;
+ public void setFinishTime(String finishTime) {
+ this.finishTime = finishTime;
}
- public String getWarehouseId()
- {
+ public String getWarehouseId() {
return warehouseId;
}
- public void setProductGuid(String productGuid)
- {
- this.productGuid = productGuid;
+ public void setWarehouseId(String warehouseId) {
+ this.warehouseId = warehouseId;
}
- public String getProductGuid()
- {
+ public String getProductGuid() {
return productGuid;
}
- public void setProductId(String productId)
- {
- this.productId = productId;
+ public void setProductGuid(String productGuid) {
+ this.productGuid = productGuid;
}
- public String getProductId()
- {
+ public String getProductId() {
return productId;
}
- public void setParentId(String parentId)
- {
- this.parentId = parentId;
+ public void setProductId(String productId) {
+ this.productId = productId;
}
- public String getParentId()
- {
+ public String getParentId() {
return parentId;
}
- public void setPrice(String price)
- {
- this.price = price;
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
}
- public String getPrice()
- {
+ public String getPrice() {
return price;
}
- public void setCargoNo(String cargoNo)
- {
- this.cargoNo = cargoNo;
+ public void setPrice(String price) {
+ this.price = price;
}
- public String getCargoNo()
- {
+ public String getCargoNo() {
return cargoNo;
}
- public void setUnit(String unit)
- {
- this.unit = unit;
+ public void setCargoNo(String cargoNo) {
+ this.cargoNo = cargoNo;
}
- public String getUnit()
- {
+ public String getUnit() {
return unit;
}
- public void setSpec(String spec)
- {
- this.spec = spec;
+ public void setUnit(String unit) {
+ this.unit = unit;
}
- public String getSpec()
- {
+ public String getSpec() {
return spec;
}
- public void setSpare1(String spare1)
- {
- this.spare1 = spare1;
+ public void setSpec(String spec) {
+ this.spec = spec;
}
- 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 setProductName(String productName)
- {
- this.productName = productName;
+ public void setSpare6(String spare6) {
+ this.spare6 = spare6;
}
- public String getProductName()
- {
+ public String getProductName() {
return productName;
}
- public void setSpare7(String spare7)
- {
- this.spare7 = spare7;
+ public void setProductName(String productName) {
+ this.productName = productName;
}
- 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 setSpare9(String spare9)
- {
- this.spare9 = spare9;
+ public void setSpare8(String spare8) {
+ this.spare8 = spare8;
}
- public String getSpare9()
- {
+ public String getSpare9() {
return spare9;
}
- public void setSpare10(String spare10)
- {
- this.spare10 = spare10;
+ public void setSpare9(String spare9) {
+ this.spare9 = spare9;
}
- public String getSpare10()
- {
+ public String getSpare10() {
return spare10;
}
- public void setSpare11(String spare11)
- {
- this.spare11 = spare11;
+ public void setSpare10(String spare10) {
+ this.spare10 = spare10;
}
- public String getSpare11()
- {
+ public String getSpare11() {
return spare11;
}
- public void setSpare12(String spare12)
- {
- this.spare12 = spare12;
+ public void setSpare11(String spare11) {
+ this.spare11 = spare11;
}
- public String getSpare12()
- {
+ public String getSpare12() {
return spare12;
}
- public void setSpare13(String spare13)
- {
- this.spare13 = spare13;
+ public void setSpare12(String spare12) {
+ this.spare12 = spare12;
}
- public String getSpare13()
- {
+ public String getSpare13() {
return spare13;
}
- public void setSpare14(String spare14)
- {
- this.spare14 = spare14;
+ public void setSpare13(String spare13) {
+ this.spare13 = spare13;
}
- public String getSpare14()
- {
+ public String getSpare14() {
return spare14;
}
- public void setSpare15(String spare15)
- {
- this.spare15 = spare15;
+ public void setSpare14(String spare14) {
+ this.spare14 = spare14;
}
- public String getSpare15()
- {
+ public String getSpare15() {
return spare15;
}
- public void setSpare16(String spare16)
- {
- this.spare16 = spare16;
+ public void setSpare15(String spare15) {
+ this.spare15 = spare15;
}
- public String getSpare16()
- {
+ public String getSpare16() {
return spare16;
}
- public void setSpare17(String spare17)
- {
- this.spare17 = spare17;
+ public void setSpare16(String spare16) {
+ this.spare16 = spare16;
}
- public String getSpare17()
- {
+ public String getSpare17() {
return spare17;
}
- public void setSpare18(String spare18)
- {
- this.spare18 = spare18;
+ public void setSpare17(String spare17) {
+ this.spare17 = spare17;
}
- public String getSpare18()
- {
+ public String getSpare18() {
return spare18;
}
- public void setSpare19(String spare19)
- {
- this.spare19 = spare19;
+ public void setSpare18(String spare18) {
+ this.spare18 = spare18;
}
- public String getSpare19()
- {
+ public String getSpare19() {
return spare19;
}
- public void setSpare20(String spare20)
- {
- this.spare20 = spare20;
+ public void setSpare19(String spare19) {
+ this.spare19 = spare19;
}
- public String getSpare20()
- {
+ public String getSpare20() {
return spare20;
}
- public void setSpare21(String spare21)
- {
- this.spare21 = spare21;
+ public void setSpare20(String spare20) {
+ this.spare20 = spare20;
}
- public String getSpare21()
- {
+ public String getSpare21() {
return spare21;
}
- public void setSpare22(String spare22)
- {
- this.spare22 = spare22;
+ public void setSpare21(String spare21) {
+ this.spare21 = spare21;
}
- public String getSpare22()
- {
+ public String getSpare22() {
return spare22;
}
- public void setSpare23(String spare23)
- {
- this.spare23 = spare23;
+ public void setSpare22(String spare22) {
+ this.spare22 = spare22;
}
- public String getSpare23()
- {
+ public String getSpare23() {
return spare23;
}
- public void setSpare24(String spare24)
- {
- this.spare24 = spare24;
+ public void setSpare23(String spare23) {
+ this.spare23 = spare23;
}
- public String getSpare24()
- {
+ public String getSpare24() {
return spare24;
}
- public void setSpare25(String spare25)
- {
- this.spare25 = spare25;
+ public void setSpare24(String spare24) {
+ this.spare24 = spare24;
}
- public String getSpare25()
- {
+ public String getSpare25() {
return spare25;
}
- public void setSpare26(String spare26)
- {
- this.spare26 = spare26;
+ public void setSpare25(String spare25) {
+ this.spare25 = spare25;
}
- public String getSpare26()
- {
+ public String getSpare26() {
return spare26;
}
- public void setSpare27(String spare27)
- {
- this.spare27 = spare27;
+ public void setSpare26(String spare26) {
+ this.spare26 = spare26;
}
- public String getSpare27()
- {
+ public String getSpare27() {
return spare27;
}
- public void setSpare28(String spare28)
- {
- this.spare28 = spare28;
+ public void setSpare27(String spare27) {
+ this.spare27 = spare27;
}
- public String getSpare28()
- {
+ public String getSpare28() {
return spare28;
}
- public void setSpare29(String spare29)
- {
- this.spare29 = spare29;
+ public void setSpare28(String spare28) {
+ this.spare28 = spare28;
}
- public String getSpare29()
- {
+ public String getSpare29() {
return spare29;
}
- public void setSpare30(String spare30)
- {
- this.spare30 = spare30;
+ public void setSpare29(String spare29) {
+ this.spare29 = spare29;
}
- public String getSpare30()
- {
+ public String getSpare30() {
return spare30;
}
- public void setSpare31(String spare31)
- {
- this.spare31 = spare31;
+ public void setSpare30(String spare30) {
+ this.spare30 = spare30;
}
- public String getSpare31()
- {
+ public String getSpare31() {
return spare31;
}
- public void setSpare32(String spare32)
- {
- this.spare32 = spare32;
+ public void setSpare31(String spare31) {
+ this.spare31 = spare31;
}
- public String getSpare32()
- {
+ public String getSpare32() {
return spare32;
}
- public void setSpare33(String spare33)
- {
- this.spare33 = spare33;
+ public void setSpare32(String spare32) {
+ this.spare32 = spare32;
}
- public String getSpare33()
- {
+ public String getSpare33() {
return spare33;
}
- public void setSpare34(String spare34)
- {
- this.spare34 = spare34;
+ public void setSpare33(String spare33) {
+ this.spare33 = spare33;
}
- public String getSpare34()
- {
+ public String getSpare34() {
return spare34;
}
- public void setSpare35(String spare35)
- {
- this.spare35 = spare35;
+ public void setSpare34(String spare34) {
+ this.spare34 = spare34;
}
- public String getSpare35()
- {
+ public String getSpare35() {
return spare35;
}
- public void setSpare36(String spare36)
- {
- this.spare36 = spare36;
+ public void setSpare35(String spare35) {
+ this.spare35 = spare35;
}
- public String getSpare36()
- {
+ public String getSpare36() {
return spare36;
}
- public void setSpare37(String spare37)
- {
- this.spare37 = spare37;
+ public void setSpare36(String spare36) {
+ this.spare36 = spare36;
}
- public String getSpare37()
- {
+ public String getSpare37() {
return spare37;
}
- public void setSpare38(String spare38)
- {
- this.spare38 = spare38;
+ public void setSpare37(String spare37) {
+ this.spare37 = spare37;
}
- public String getSpare38()
- {
+ public String getSpare38() {
return spare38;
}
- public void setSpare39(String spare39)
- {
- this.spare39 = spare39;
+ public void setSpare38(String spare38) {
+ this.spare38 = spare38;
}
- public String getSpare39()
- {
+ public String getSpare39() {
return spare39;
}
- public void setCustomerName(String customerName)
- {
- this.customerName = customerName;
+ public void setSpare39(String spare39) {
+ this.spare39 = spare39;
}
- public String getCustomerName()
- {
+ public String getCustomerName() {
return customerName;
}
+ public void setCustomerName(String customerName) {
+ this.customerName = customerName;
+ }
+
+ public String getLineId() {
+ return lineId;
+ }
+
+ public void setLineId(String lineId) {
+ this.lineId = lineId;
+ }
+
+ @Override
+ public String getRemark() {
+ return remark;
+ }
+
+ @Override
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ @Override
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("jobId", getJobId())
- .append("jobDetailId", getJobDetailId())
- .append("status", getStatus())
- .append("taskNo", getTaskNo())
- .append("trayCode", getTrayCode())
- .append("roadwayId", getRoadwayId())
- .append("cargoSpaceId", getCargoSpaceId())
- .append("cargoSpaceName", getCargoSpaceName())
- .append("thePlatoon", getThePlatoon())
- .append("theColumn", getTheColumn())
- .append("theFloor", getTheFloor())
- .append("priority", getPriority())
- .append("executionPhase", getExecutionPhase())
- .append("inOrOut", getInOrOut())
- .append("exitId", getExitId())
- .append("wlbh", getWlbh())
- .append("lotNo", getLotNo())
- .append("stackingId", getStackingId())
- .append("stockStatus", getStockStatus())
- .append("outQuantity", getOutQuantity())
- .append("giveNum", getGiveNum())
- .append("inOrOutId", getInOrOutId())
- .append("inOrOutDId", getInOrOutDId())
- .append("createTime", getCreateTime())
- .append("startTime", getStartTime())
- .append("finishTime", getFinishTime())
- .append("warehouseId", getWarehouseId())
- .append("productGuid", getProductGuid())
- .append("productId", getProductId())
- .append("parentId", getParentId())
- .append("price", getPrice())
- .append("cargoNo", getCargoNo())
- .append("unit", getUnit())
- .append("spec", getSpec())
- .append("remark", getRemark())
- .append("spare1", getSpare1())
- .append("spare2", getSpare2())
- .append("spare3", getSpare3())
- .append("spare4", getSpare4())
- .append("spare5", getSpare5())
- .append("spare6", getSpare6())
- .append("productName", getProductName())
- .append("spare7", getSpare7())
- .append("spare8", getSpare8())
- .append("spare9", getSpare9())
- .append("spare10", getSpare10())
- .append("spare11", getSpare11())
- .append("spare12", getSpare12())
- .append("spare13", getSpare13())
- .append("spare14", getSpare14())
- .append("spare15", getSpare15())
- .append("spare16", getSpare16())
- .append("spare17", getSpare17())
- .append("spare18", getSpare18())
- .append("spare19", getSpare19())
- .append("spare20", getSpare20())
- .append("spare21", getSpare21())
- .append("spare22", getSpare22())
- .append("spare23", getSpare23())
- .append("spare24", getSpare24())
- .append("spare25", getSpare25())
- .append("spare26", getSpare26())
- .append("spare27", getSpare27())
- .append("spare28", getSpare28())
- .append("spare29", getSpare29())
- .append("spare30", getSpare30())
- .append("spare31", getSpare31())
- .append("spare32", getSpare32())
- .append("spare33", getSpare33())
- .append("spare34", getSpare34())
- .append("spare35", getSpare35())
- .append("spare36", getSpare36())
- .append("spare37", getSpare37())
- .append("spare38", getSpare38())
- .append("spare39", getSpare39())
- .append("customerName", getCustomerName())
- .toString();
+ return "ViewOutJobFlow{" +
+ "jobId='" + jobId + '\'' +
+ ", jobDetailId='" + jobDetailId + '\'' +
+ ", status='" + status + '\'' +
+ ", taskNo='" + taskNo + '\'' +
+ ", trayCode='" + trayCode + '\'' +
+ ", roadwayId='" + roadwayId + '\'' +
+ ", cargoSpaceId='" + cargoSpaceId + '\'' +
+ ", cargoSpaceName='" + cargoSpaceName + '\'' +
+ ", thePlatoon=" + thePlatoon +
+ ", theColumn=" + theColumn +
+ ", theFloor=" + theFloor +
+ ", priority=" + priority +
+ ", executionPhase='" + executionPhase + '\'' +
+ ", inOrOut='" + inOrOut + '\'' +
+ ", exitId='" + exitId + '\'' +
+ ", wlbh='" + wlbh + '\'' +
+ ", lotNo='" + lotNo + '\'' +
+ ", stackingId='" + stackingId + '\'' +
+ ", stockStatus='" + stockStatus + '\'' +
+ ", outQuantity='" + outQuantity + '\'' +
+ ", giveNum='" + giveNum + '\'' +
+ ", inOrOutId='" + inOrOutId + '\'' +
+ ", inOrOutDId='" + inOrOutDId + '\'' +
+ ", startTime='" + startTime + '\'' +
+ ", finishTime='" + finishTime + '\'' +
+ ", warehouseId='" + warehouseId + '\'' +
+ ", productGuid='" + productGuid + '\'' +
+ ", productId='" + productId + '\'' +
+ ", parentId='" + parentId + '\'' +
+ ", price='" + price + '\'' +
+ ", cargoNo='" + cargoNo + '\'' +
+ ", unit='" + unit + '\'' +
+ ", spec='" + spec + '\'' +
+ ", spare1='" + spare1 + '\'' +
+ ", spare2='" + spare2 + '\'' +
+ ", spare3='" + spare3 + '\'' +
+ ", spare4='" + spare4 + '\'' +
+ ", spare5='" + spare5 + '\'' +
+ ", spare6='" + spare6 + '\'' +
+ ", productName='" + productName + '\'' +
+ ", spare7='" + spare7 + '\'' +
+ ", spare8='" + spare8 + '\'' +
+ ", spare9='" + spare9 + '\'' +
+ ", spare10='" + spare10 + '\'' +
+ ", spare11='" + spare11 + '\'' +
+ ", spare12='" + spare12 + '\'' +
+ ", spare13='" + spare13 + '\'' +
+ ", spare14='" + spare14 + '\'' +
+ ", spare15='" + spare15 + '\'' +
+ ", spare16='" + spare16 + '\'' +
+ ", spare17='" + spare17 + '\'' +
+ ", spare18='" + spare18 + '\'' +
+ ", spare19='" + spare19 + '\'' +
+ ", spare20='" + spare20 + '\'' +
+ ", spare21='" + spare21 + '\'' +
+ ", spare22='" + spare22 + '\'' +
+ ", spare23='" + spare23 + '\'' +
+ ", spare24='" + spare24 + '\'' +
+ ", spare25='" + spare25 + '\'' +
+ ", spare26='" + spare26 + '\'' +
+ ", spare27='" + spare27 + '\'' +
+ ", spare28='" + spare28 + '\'' +
+ ", spare29='" + spare29 + '\'' +
+ ", spare30='" + spare30 + '\'' +
+ ", spare31='" + spare31 + '\'' +
+ ", spare32='" + spare32 + '\'' +
+ ", spare33='" + spare33 + '\'' +
+ ", spare34='" + spare34 + '\'' +
+ ", spare35='" + spare35 + '\'' +
+ ", spare36='" + spare36 + '\'' +
+ ", spare37='" + spare37 + '\'' +
+ ", spare38='" + spare38 + '\'' +
+ ", spare39='" + spare39 + '\'' +
+ ", customerName='" + customerName + '\'' +
+ ", lineId='" + lineId + '\'' +
+ ", remark='" + remark + '\'' +
+ ", creatTime='" + createTime + '\'' +
+ '}';
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
index c831e08..6b23bf5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
@@ -2,6 +2,10 @@ package com.ruoyi.search.ViewStockDetail.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
/**
* 库存明细查询对象 view_stock_detail
@@ -9,28 +13,47 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author gw
* @date 2025-05-26
*/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
public class ViewStockDetail extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 序号 */
- @Excel(name = "序号")
+// @Excel(name = "序号")
private Long onlyIdentity;
/** 库存ID */
@Excel(name = "库存ID")
private String stockId;
+ @Excel(name = "订单号")
+ private String orderId;
+
+ /** 物料编码 */
+ @Excel(name = "物料编码")
+ private String productId;
+
+ /** 物料名称 */
+ @Excel(name = "物料名称")
+ private String productName;
+
/** 货位ID */
- @Excel(name = "货位ID")
+// @Excel(name = "货位ID")
private String cargoSpaceId;
+ /** 货位名称 */
+ @Excel(name = "货位名称")
+ private String cargoSpaceName;
+
/** 托盘条码 */
@Excel(name = "托盘条码")
private String trayCode;
/** 数量 */
- @Excel(name = "数量")
+// @Excel(name = "数量")
private String quantity;
/** 作业ID */
@@ -38,7 +61,7 @@ public class ViewStockDetail extends BaseEntity
private String jobId;
/** 批号 */
- @Excel(name = "批号")
+// @Excel(name = "批号")
private String lotNo;
/** 入库子单ID */
@@ -50,21 +73,17 @@ public class ViewStockDetail extends BaseEntity
private String inDate;
/** 仓库ID */
- @Excel(name = "仓库ID")
+// @Excel(name = "仓库ID")
private String warehouseId;
/** 仓库名称 */
- @Excel(name = "仓库名称")
+// @Excel(name = "仓库名称")
private String warehouseName;
/** 垛型ID */
- @Excel(name = "垛型ID")
+// @Excel(name = "垛型ID")
private String stackingId;
- /** 货位名称 */
- @Excel(name = "货位名称")
- private String cargoSpaceName;
-
/** 巷道ID */
@Excel(name = "巷道ID")
private String roadwayId;
@@ -82,21 +101,13 @@ public class ViewStockDetail extends BaseEntity
private String productStatus;
/** 是否锁定 Y锁、N开 */
- @Excel(name = "是否锁定", dictType = "cargo_space_lock_status")
+// @Excel(name = "是否锁定", dictType = "cargo_space_lock_status")
private String locked;
/** 物料GUID */
@Excel(name = "物料GUID")
private String productGuid;
- /** 物料编码 */
- @Excel(name = "物料编码")
- private String productId;
-
- /** 物料名称 */
- @Excel(name = "物料名称")
- private String productName;
-
/** 规格 */
@Excel(name = "规格")
private String spec;
@@ -277,719 +288,4 @@ public class ViewStockDetail extends BaseEntity
@Excel(name = "描述")
private String remark;
-
-
- 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 getWarehouseName() {
- return warehouseName;
- }
-
- public void setWarehouseName(String warehouseName) {
- this.warehouseName = warehouseName;
- }
-
- @Override
- public String getRemark() {
- return remark;
- }
-
- @Override
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- 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 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 void setOnlyIdentity(Long onlyIdentity)
- {
- this.onlyIdentity = onlyIdentity;
- }
-
- public Long getOnlyIdentity()
- {
- return onlyIdentity;
- }
-
- public void setStockId(String stockId)
- {
- this.stockId = stockId;
- }
-
- public String getStockId()
- {
- return stockId;
- }
-
- public void setCargoSpaceId(String cargoSpaceId)
- {
- this.cargoSpaceId = cargoSpaceId;
- }
-
- public String getCargoSpaceId()
- {
- return cargoSpaceId;
- }
-
- public void setTrayCode(String trayCode)
- {
- this.trayCode = trayCode;
- }
-
- public String getTrayCode()
- {
- return trayCode;
- }
-
- public void setQuantity(String quantity)
- {
- this.quantity = quantity;
- }
-
- public String getQuantity()
- {
- return quantity;
- }
-
- public void setJobId(String jobId)
- {
- this.jobId = jobId;
- }
-
- public String getJobId()
- {
- return jobId;
- }
-
- public void setLotNo(String lotNo)
- {
- this.lotNo = lotNo;
- }
-
- public String getLotNo()
- {
- return lotNo;
- }
-
- public void setStockinDetailId(String stockinDetailId)
- {
- this.stockinDetailId = stockinDetailId;
- }
-
- public String getStockinDetailId()
- {
- return stockinDetailId;
- }
-
- public void setInDate(String inDate)
- {
- this.inDate = inDate;
- }
-
- public String getInDate()
- {
- return inDate;
- }
-
- public void setWarehouseId(String warehouseId)
- {
- this.warehouseId = warehouseId;
- }
-
- public String getWarehouseId()
- {
- return warehouseId;
- }
-
- public void setStackingId(String stackingId)
- {
- this.stackingId = stackingId;
- }
-
- public String getStackingId()
- {
- return stackingId;
- }
-
- public void setCargoSpaceName(String cargoSpaceName)
- {
- this.cargoSpaceName = cargoSpaceName;
- }
-
- public String getCargoSpaceName()
- {
- return cargoSpaceName;
- }
-
- public void setRoadwayId(String roadwayId)
- {
- this.roadwayId = roadwayId;
- }
-
- public String getRoadwayId()
- {
- return roadwayId;
- }
-
- public void setCargoSpaceStatus(String cargoSpaceStatus)
- {
- this.cargoSpaceStatus = cargoSpaceStatus;
- }
-
- public String getCargoSpaceStatus()
- {
- return cargoSpaceStatus;
- }
-
- public void setLocked(String locked)
- {
- this.locked = locked;
- }
-
- public String getLocked()
- {
- return locked;
- }
-
- public void setProductId(String productId)
- {
- this.productId = productId;
- }
-
- public String getProductId()
- {
- return productId;
- }
-
- public void setProductName(String productName)
- {
- this.productName = productName;
- }
-
- public String getProductName()
- {
- return productName;
- }
-
- public void setSpec(String spec)
- {
- this.spec = spec;
- }
-
- public String getSpec()
- {
- return spec;
- }
-
- public void setUnit(String unit)
- {
- this.unit = unit;
- }
-
- public String getUnit()
- {
- return unit;
- }
-
- public void setPrice(String price)
- {
- this.price = price;
- }
-
- public String getPrice()
- {
- return 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 getProductGuid()
- {
- return productGuid;
- }
-
- public void setProductGuid(String productGuid)
- {
- this.productGuid = productGuid;
- }
-
- 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 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;
- }
-
- @Override
- public String toString() {
- return "ViewStockDetail{" +
- "onlyIdentity=" + onlyIdentity +
- ", stockId='" + stockId + '\'' +
- ", cargoSpaceId='" + cargoSpaceId + '\'' +
- ", trayCode='" + trayCode + '\'' +
- ", quantity='" + quantity + '\'' +
- ", jobId='" + jobId + '\'' +
- ", lotNo='" + lotNo + '\'' +
- ", stockinDetailId='" + stockinDetailId + '\'' +
- ", inDate='" + inDate + '\'' +
- ", warehouseId='" + warehouseId + '\'' +
- ", warehouseName='" + warehouseName + '\'' +
- ", stackingId='" + stackingId + '\'' +
- ", cargoSpaceName='" + cargoSpaceName + '\'' +
- ", roadwayId='" + roadwayId + '\'' +
- ", cargoSpaceStatus='" + cargoSpaceStatus + '\'' +
- ", stockStatus='" + stockStatus + '\'' +
- ", productStatus='" + productStatus + '\'' +
- ", locked='" + locked + '\'' +
- ", productGuid='" + productGuid + '\'' +
- ", productId='" + productId + '\'' +
- ", productName='" + productName + '\'' +
- ", spec='" + spec + '\'' +
- ", unit='" + unit + '\'' +
- ", price='" + price + '\'' +
- ", parentId='" + parentId + '\'' +
- ", cargoNo='" + cargoNo + '\'' +
- ", spare1='" + spare1 + '\'' +
- ", spare2='" + spare2 + '\'' +
- ", spare3='" + spare3 + '\'' +
- ", spare4='" + spare4 + '\'' +
- ", spare5='" + spare5 + '\'' +
- ", spare6='" + spare6 + '\'' +
- ", spare7='" + spare7 + '\'' +
- ", spare8='" + spare8 + '\'' +
- ", spare9='" + spare9 + '\'' +
- ", spare10='" + spare10 + '\'' +
- ", spare11='" + spare11 + '\'' +
- ", spare12='" + spare12 + '\'' +
- ", spare13='" + spare13 + '\'' +
- ", spare14='" + spare14 + '\'' +
- ", spare15='" + spare15 + '\'' +
- ", spare16='" + spare16 + '\'' +
- ", spare17='" + spare17 + '\'' +
- ", spare18='" + spare18 + '\'' +
- ", spare19='" + spare19 + '\'' +
- ", spare20='" + spare20 + '\'' +
- ", spare21='" + spare21 + '\'' +
- ", spare22='" + spare22 + '\'' +
- ", spare23='" + spare23 + '\'' +
- ", spare24='" + spare24 + '\'' +
- ", spare25='" + spare25 + '\'' +
- ", spare26='" + spare26 + '\'' +
- ", spare27='" + spare27 + '\'' +
- ", spare28='" + spare28 + '\'' +
- ", spare29='" + spare29 + '\'' +
- ", spare30='" + spare30 + '\'' +
- ", spare31='" + spare31 + '\'' +
- ", spare32='" + spare32 + '\'' +
- ", spare33='" + spare33 + '\'' +
- ", spare34='" + spare34 + '\'' +
- ", spare35='" + spare35 + '\'' +
- ", spare36='" + spare36 + '\'' +
- ", spare37='" + spare37 + '\'' +
- ", spare38='" + spare38 + '\'' +
- ", spare39='" + spare39 + '\'' +
- ", remark='" + remark + '\'' +
- '}';
- }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
index fd3e848..100e6f4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
@@ -1,5 +1,9 @@
package com.ruoyi.search.ViewStockinHistory.domain;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -11,20 +15,27 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author gw
* @date 2025-09-19
*/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
public class ViewStockinHistory extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 入库单guid */
- @Excel(name = "入库单guid")
+// @Excel(name = "入库单guid")
private String stockinGuid;
/** 入库单号 */
@Excel(name = "入库单号")
private String stockinId;
+ /** 入库明细ID */
+ @Excel(name = "入库子单号")
+ private String stockinDetailId;
/** 入库类型 */
- @Excel(name = "入库类型")
+ @Excel(name = "入库类型", dictType = "in_job_type")
private String inType;
/** 创建时间 */
@@ -34,121 +45,123 @@ public class ViewStockinHistory extends BaseEntity
/** 创建人 */
@Excel(name = "创建人")
private String createManId;
+ /** ERP单号 */
+ @Excel(name = "订单号")
+ private String erpBill;
+ /** 物料编码 */
+ @Excel(name = "物料编码")
+ private String productId;
+ /** 物料名称 */
+ @Excel(name = "物料名称")
+ private String productName;
+ /** 供应商名称 */
+ @Excel(name = "供应商名称")
+ private String supplierName;
/** 单据状态 */
@Excel(name = "单据状态")
private String status;
/** 仓库ID */
- @Excel(name = "仓库ID")
+// @Excel(name = "仓库ID")
private String warehouseId;
/** 完成时间 */
- @Excel(name = "完成时间")
+// @Excel(name = "完成时间")
private String finishDate;
- /** ERP单号 */
- @Excel(name = "ERP单号")
- private String erpBill;
-
/** 单据来源 */
- @Excel(name = "单据来源")
+// @Excel(name = "单据来源")
private String stockSource;
/** 部门编码 */
- @Excel(name = "部门编码")
+// @Excel(name = "部门编码")
private String departmentNo;
/** 班组编码 */
- @Excel(name = "班组编码")
+// @Excel(name = "班组编码")
private String classNo;
/** 供应商编号 */
- @Excel(name = "供应商编号")
+// @Excel(name = "供应商编号")
private String supplierNo;
- /** 供应商名称 */
- @Excel(name = "供应商名称")
- private String supplierName;
+
/** 供应商简称 */
- @Excel(name = "供应商简称")
+// @Excel(name = "供应商简称")
private String simpleName;
/** 联系人 */
- @Excel(name = "联系人")
+// @Excel(name = "联系人")
private String contactName;
/** 联系电话 */
- @Excel(name = "联系电话")
+// @Excel(name = "联系电话")
private String contactNumber;
/** 供应商地址 */
- @Excel(name = "供应商地址")
+// @Excel(name = "供应商地址")
private String address;
- /** 入库明细ID */
- @Excel(name = "入库明细ID")
- private String stockinDetailId;
+
/** 批次号 */
@Excel(name = "批次号")
private String lotNo;
/** 计划数量 */
- @Excel(name = "计划数量")
+// @Excel(name = "计划数量")
private String quantity;
/** 计划箱数 */
- @Excel(name = "计划箱数")
+// @Excel(name = "计划箱数")
private String quantityX;
/** 计划件数 */
- @Excel(name = "计划件数")
+// @Excel(name = "计划件数")
private String quantityJ;
/** 实际数量 */
- @Excel(name = "实际数量")
+// @Excel(name = "实际数量")
private String assignNum;
/** 实际箱数 */
- @Excel(name = "实际箱数")
+// @Excel(name = "实际箱数")
private String assignNumX;
/** 实际件数 */
- @Excel(name = "实际件数")
+// @Excel(name = "实际件数")
private String assignNumJ;
/** 扫码数量 */
- @Excel(name = "扫码数量")
+// @Excel(name = "扫码数量")
private String scanNum;
/** 扫码箱数 */
- @Excel(name = "扫码箱数")
+// @Excel(name = "扫码箱数")
private String scanNumX;
/** 扫码件数 */
- @Excel(name = "扫码件数")
+// @Excel(name = "扫码件数")
private String scanNumJ;
/** 入库日期 */
- @Excel(name = "入库日期")
+// @Excel(name = "入库日期")
private String printDate;
/** 库存状态 */
- @Excel(name = "库存状态")
+ @Excel(name = "库存状态" ,dictType = "stock_status")
private String stockStatus;
/** 物料主键 */
- @Excel(name = "物料主键")
+// @Excel(name = "物料主键")
private String productGuid;
- /** 物料编码 */
- @Excel(name = "物料编码")
- private String productId;
+
/** 产品分类 */
- @Excel(name = "产品分类")
+// @Excel(name = "产品分类")
private String parentId;
/** 品号描述 */
@@ -168,39 +181,37 @@ public class ViewStockinHistory extends BaseEntity
private String spec;
/** 型号 */
- @Excel(name = "型号")
+// @Excel(name = "型号")
private String spare1;
/** 单件净重 */
- @Excel(name = "单件净重")
+// @Excel(name = "单件净重")
private String spare2;
/** 颜色 */
- @Excel(name = "颜色")
+// @Excel(name = "颜色")
private String spare3;
/** 序列号 */
- @Excel(name = "序列号")
+// @Excel(name = "序列号")
private String spare4;
/** 电压 */
- @Excel(name = "电压")
+// @Excel(name = "电压")
private String spare5;
/** 功率 */
- @Excel(name = "功率")
+// @Excel(name = "功率")
private String spare6;
- /** 物料名称 */
- @Excel(name = "物料名称")
- private String productName;
+
/** 相位 */
- @Excel(name = "相位")
+// @Excel(name = "相位")
private String spare7;
/** 毛重 */
- @Excel(name = "毛重")
+// @Excel(name = "毛重")
private String spare8;
/** NC号 */
@@ -326,884 +337,11 @@ public class ViewStockinHistory extends BaseEntity
/** 包装材积 */
@Excel(name = "包装材积")
private String spare39;
-
+ @Excel(name = "描述")
+ private String remark;
/** 仓库名称 */
- @Excel(name = "仓库名称")
+// @Excel(name = "仓库名称")
private String warehouseName;
- public void setStockinGuid(String stockinGuid)
- {
- this.stockinGuid = stockinGuid;
- }
- public String getStockinGuid()
- {
- return stockinGuid;
- }
-
- public void setStockinId(String stockinId)
- {
- this.stockinId = stockinId;
- }
-
- public String getStockinId()
- {
- return stockinId;
- }
-
- public void setInType(String inType)
- {
- this.inType = inType;
- }
-
- public String getInType()
- {
- return inType;
- }
-
- public void setCreateDate(String createDate)
- {
- this.createDate = createDate;
- }
-
- public String getCreateDate()
- {
- return createDate;
- }
-
- public void setCreateManId(String createManId)
- {
- this.createManId = createManId;
- }
-
- public String getCreateManId()
- {
- return createManId;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setWarehouseId(String warehouseId)
- {
- this.warehouseId = warehouseId;
- }
-
- public String getWarehouseId()
- {
- return warehouseId;
- }
-
- public void setFinishDate(String finishDate)
- {
- this.finishDate = finishDate;
- }
-
- public String getFinishDate()
- {
- return finishDate;
- }
-
- public void setErpBill(String erpBill)
- {
- this.erpBill = erpBill;
- }
-
- public String getErpBill()
- {
- return erpBill;
- }
-
- public void setStockSource(String stockSource)
- {
- this.stockSource = stockSource;
- }
-
- public String getStockSource()
- {
- return stockSource;
- }
-
- public void setDepartmentNo(String departmentNo)
- {
- this.departmentNo = departmentNo;
- }
-
- public String getDepartmentNo()
- {
- return departmentNo;
- }
-
- public void setClassNo(String classNo)
- {
- this.classNo = classNo;
- }
-
- public String getClassNo()
- {
- return classNo;
- }
-
- public void setSupplierNo(String supplierNo)
- {
- this.supplierNo = supplierNo;
- }
-
- public String getSupplierNo()
- {
- return supplierNo;
- }
-
- public void setSupplierName(String supplierName)
- {
- this.supplierName = supplierName;
- }
-
- public String getSupplierName()
- {
- return supplierName;
- }
-
- public void setSimpleName(String simpleName)
- {
- this.simpleName = simpleName;
- }
-
- public String getSimpleName()
- {
- return simpleName;
- }
-
- public void setContactName(String contactName)
- {
- this.contactName = contactName;
- }
-
- public String getContactName()
- {
- return contactName;
- }
-
- public void setContactNumber(String contactNumber)
- {
- this.contactNumber = contactNumber;
- }
-
- public String getContactNumber()
- {
- return contactNumber;
- }
-
- public void setAddress(String address)
- {
- this.address = address;
- }
-
- public String getAddress()
- {
- return address;
- }
-
- public void setStockinDetailId(String stockinDetailId)
- {
- this.stockinDetailId = stockinDetailId;
- }
-
- public String getStockinDetailId()
- {
- return stockinDetailId;
- }
-
- public void setLotNo(String lotNo)
- {
- this.lotNo = lotNo;
- }
-
- public String getLotNo()
- {
- return lotNo;
- }
-
- public void setQuantity(String quantity)
- {
- this.quantity = quantity;
- }
-
- public String getQuantity()
- {
- return quantity;
- }
-
- public void setQuantityX(String quantityX)
- {
- this.quantityX = quantityX;
- }
-
- public String getQuantityX()
- {
- return quantityX;
- }
-
- public void setQuantityJ(String quantityJ)
- {
- this.quantityJ = quantityJ;
- }
-
- public String getQuantityJ()
- {
- return quantityJ;
- }
-
- public void setAssignNum(String assignNum)
- {
- this.assignNum = assignNum;
- }
-
- public String getAssignNum()
- {
- return assignNum;
- }
-
- public void setAssignNumX(String assignNumX)
- {
- this.assignNumX = assignNumX;
- }
-
- public String getAssignNumX()
- {
- return assignNumX;
- }
-
- public void setAssignNumJ(String assignNumJ)
- {
- this.assignNumJ = assignNumJ;
- }
-
- public String getAssignNumJ()
- {
- return assignNumJ;
- }
-
- public void setScanNum(String scanNum)
- {
- this.scanNum = scanNum;
- }
-
- public String getScanNum()
- {
- return scanNum;
- }
-
- public void setScanNumX(String scanNumX)
- {
- this.scanNumX = scanNumX;
- }
-
- public String getScanNumX()
- {
- return scanNumX;
- }
-
- public void setScanNumJ(String scanNumJ)
- {
- this.scanNumJ = scanNumJ;
- }
-
- public String getScanNumJ()
- {
- return scanNumJ;
- }
-
- public void setPrintDate(String printDate)
- {
- this.printDate = printDate;
- }
-
- public String getPrintDate()
- {
- return printDate;
- }
-
- public void setStockStatus(String stockStatus)
- {
- this.stockStatus = stockStatus;
- }
-
- public String getStockStatus()
- {
- return stockStatus;
- }
-
- public void setProductGuid(String productGuid)
- {
- this.productGuid = productGuid;
- }
-
- public String getProductGuid()
- {
- return productGuid;
- }
-
- public void setProductId(String productId)
- {
- this.productId = productId;
- }
-
- public String getProductId()
- {
- return productId;
- }
-
- public void setParentId(String parentId)
- {
- this.parentId = parentId;
- }
-
- public String getParentId()
- {
- return parentId;
- }
-
- public void setPrice(String price)
- {
- this.price = price;
- }
-
- public String getPrice()
- {
- return price;
- }
-
- public void setCargoNo(String cargoNo)
- {
- this.cargoNo = cargoNo;
- }
-
- public String getCargoNo()
- {
- return cargoNo;
- }
-
- public void setUnit(String unit)
- {
- this.unit = unit;
- }
-
- public String getUnit()
- {
- return unit;
- }
-
- public void setSpec(String spec)
- {
- this.spec = spec;
- }
-
- public String getSpec()
- {
- return spec;
- }
-
- public void setSpare1(String spare1)
- {
- this.spare1 = spare1;
- }
-
- public String getSpare1()
- {
- return spare1;
- }
-
- public void setSpare2(String spare2)
- {
- this.spare2 = spare2;
- }
-
- public String getSpare2()
- {
- return spare2;
- }
-
- public void setSpare3(String spare3)
- {
- this.spare3 = spare3;
- }
-
- public String getSpare3()
- {
- return spare3;
- }
-
- public void setSpare4(String spare4)
- {
- this.spare4 = spare4;
- }
-
- public String getSpare4()
- {
- return spare4;
- }
-
- public void setSpare5(String spare5)
- {
- this.spare5 = spare5;
- }
-
- public String getSpare5()
- {
- return spare5;
- }
-
- public void setSpare6(String spare6)
- {
- this.spare6 = spare6;
- }
-
- public String getSpare6()
- {
- return spare6;
- }
-
- public void setProductName(String productName)
- {
- this.productName = productName;
- }
-
- public String getProductName()
- {
- return productName;
- }
-
- public void setSpare7(String spare7)
- {
- this.spare7 = spare7;
- }
-
- public String getSpare7()
- {
- return spare7;
- }
-
- public void setSpare8(String spare8)
- {
- this.spare8 = spare8;
- }
-
- public String getSpare8()
- {
- return spare8;
- }
-
- public void setSpare9(String spare9)
- {
- this.spare9 = spare9;
- }
-
- public String getSpare9()
- {
- return spare9;
- }
-
- public void setSpare10(String spare10)
- {
- this.spare10 = spare10;
- }
-
- public String getSpare10()
- {
- return spare10;
- }
-
- public void setSpare11(String spare11)
- {
- this.spare11 = spare11;
- }
-
- public String getSpare11()
- {
- return spare11;
- }
-
- public void setSpare12(String spare12)
- {
- this.spare12 = spare12;
- }
-
- public String getSpare12()
- {
- return spare12;
- }
-
- public void setSpare13(String spare13)
- {
- this.spare13 = spare13;
- }
-
- public String getSpare13()
- {
- return spare13;
- }
-
- public void setSpare14(String spare14)
- {
- this.spare14 = spare14;
- }
-
- public String getSpare14()
- {
- return spare14;
- }
-
- public void setSpare15(String spare15)
- {
- this.spare15 = spare15;
- }
-
- public String getSpare15()
- {
- return spare15;
- }
-
- public void setSpare16(String spare16)
- {
- this.spare16 = spare16;
- }
-
- public String getSpare16()
- {
- return spare16;
- }
-
- public void setSpare17(String spare17)
- {
- this.spare17 = spare17;
- }
-
- public String getSpare17()
- {
- return spare17;
- }
-
- public void setSpare18(String spare18)
- {
- this.spare18 = spare18;
- }
-
- public String getSpare18()
- {
- return spare18;
- }
-
- public void setSpare19(String spare19)
- {
- this.spare19 = spare19;
- }
-
- public String getSpare19()
- {
- return spare19;
- }
-
- public void setSpare20(String spare20)
- {
- this.spare20 = spare20;
- }
-
- public String getSpare20()
- {
- return spare20;
- }
-
- public void setSpare21(String spare21)
- {
- this.spare21 = spare21;
- }
-
- public String getSpare21()
- {
- return spare21;
- }
-
- public void setSpare22(String spare22)
- {
- this.spare22 = spare22;
- }
-
- public String getSpare22()
- {
- return spare22;
- }
-
- public void setSpare23(String spare23)
- {
- this.spare23 = spare23;
- }
-
- public String getSpare23()
- {
- return spare23;
- }
-
- public void setSpare24(String spare24)
- {
- this.spare24 = spare24;
- }
-
- public String getSpare24()
- {
- return spare24;
- }
-
- public void setSpare25(String spare25)
- {
- this.spare25 = spare25;
- }
-
- public String getSpare25()
- {
- return spare25;
- }
-
- public void setSpare26(String spare26)
- {
- this.spare26 = spare26;
- }
-
- public String getSpare26()
- {
- return spare26;
- }
-
- public void setSpare27(String spare27)
- {
- this.spare27 = spare27;
- }
-
- public String getSpare27()
- {
- return spare27;
- }
-
- public void setSpare28(String spare28)
- {
- this.spare28 = spare28;
- }
-
- public String getSpare28()
- {
- return spare28;
- }
-
- public void setSpare29(String spare29)
- {
- this.spare29 = spare29;
- }
-
- public String getSpare29()
- {
- return spare29;
- }
-
- public void setSpare30(String spare30)
- {
- this.spare30 = spare30;
- }
-
- public String getSpare30()
- {
- return spare30;
- }
-
- public void setSpare31(String spare31)
- {
- this.spare31 = spare31;
- }
-
- public String getSpare31()
- {
- return spare31;
- }
-
- public void setSpare32(String spare32)
- {
- this.spare32 = spare32;
- }
-
- public String getSpare32()
- {
- return spare32;
- }
-
- public void setSpare33(String spare33)
- {
- this.spare33 = spare33;
- }
-
- public String getSpare33()
- {
- return spare33;
- }
-
- public void setSpare34(String spare34)
- {
- this.spare34 = spare34;
- }
-
- public String getSpare34()
- {
- return spare34;
- }
-
- public void setSpare35(String spare35)
- {
- this.spare35 = spare35;
- }
-
- public String getSpare35()
- {
- return spare35;
- }
-
- public void setSpare36(String spare36)
- {
- this.spare36 = spare36;
- }
-
- public String getSpare36()
- {
- return spare36;
- }
-
- public void setSpare37(String spare37)
- {
- this.spare37 = spare37;
- }
-
- public String getSpare37()
- {
- return spare37;
- }
-
- public void setSpare38(String spare38)
- {
- this.spare38 = spare38;
- }
-
- public String getSpare38()
- {
- return spare38;
- }
-
- public void setSpare39(String spare39)
- {
- this.spare39 = spare39;
- }
-
- public String getSpare39()
- {
- return spare39;
- }
-
- public void setWarehouseName(String warehouseName)
- {
- this.warehouseName = warehouseName;
- }
-
- public String getWarehouseName()
- {
- return warehouseName;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("stockinGuid", getStockinGuid())
- .append("stockinId", getStockinId())
- .append("inType", getInType())
- .append("createDate", getCreateDate())
- .append("createManId", getCreateManId())
- .append("status", getStatus())
- .append("warehouseId", getWarehouseId())
- .append("finishDate", getFinishDate())
- .append("erpBill", getErpBill())
- .append("stockSource", getStockSource())
- .append("departmentNo", getDepartmentNo())
- .append("classNo", getClassNo())
- .append("supplierNo", getSupplierNo())
- .append("supplierName", getSupplierName())
- .append("simpleName", getSimpleName())
- .append("contactName", getContactName())
- .append("contactNumber", getContactNumber())
- .append("address", getAddress())
- .append("stockinDetailId", getStockinDetailId())
- .append("lotNo", getLotNo())
- .append("quantity", getQuantity())
- .append("quantityX", getQuantityX())
- .append("quantityJ", getQuantityJ())
- .append("assignNum", getAssignNum())
- .append("assignNumX", getAssignNumX())
- .append("assignNumJ", getAssignNumJ())
- .append("scanNum", getScanNum())
- .append("scanNumX", getScanNumX())
- .append("scanNumJ", getScanNumJ())
- .append("printDate", getPrintDate())
- .append("stockStatus", getStockStatus())
- .append("productGuid", getProductGuid())
- .append("productId", getProductId())
- .append("parentId", getParentId())
- .append("price", getPrice())
- .append("cargoNo", getCargoNo())
- .append("unit", getUnit())
- .append("spec", getSpec())
- .append("remark", getRemark())
- .append("spare1", getSpare1())
- .append("spare2", getSpare2())
- .append("spare3", getSpare3())
- .append("spare4", getSpare4())
- .append("spare5", getSpare5())
- .append("spare6", getSpare6())
- .append("productName", getProductName())
- .append("spare7", getSpare7())
- .append("spare8", getSpare8())
- .append("spare9", getSpare9())
- .append("spare10", getSpare10())
- .append("spare11", getSpare11())
- .append("spare12", getSpare12())
- .append("spare13", getSpare13())
- .append("spare14", getSpare14())
- .append("spare15", getSpare15())
- .append("spare16", getSpare16())
- .append("spare17", getSpare17())
- .append("spare18", getSpare18())
- .append("spare19", getSpare19())
- .append("spare20", getSpare20())
- .append("spare21", getSpare21())
- .append("spare22", getSpare22())
- .append("spare23", getSpare23())
- .append("spare24", getSpare24())
- .append("spare25", getSpare25())
- .append("spare26", getSpare26())
- .append("spare27", getSpare27())
- .append("spare28", getSpare28())
- .append("spare29", getSpare29())
- .append("spare30", getSpare30())
- .append("spare31", getSpare31())
- .append("spare32", getSpare32())
- .append("spare33", getSpare33())
- .append("spare34", getSpare34())
- .append("spare35", getSpare35())
- .append("spare36", getSpare36())
- .append("spare37", getSpare37())
- .append("spare38", getSpare38())
- .append("spare39", getSpare39())
- .append("warehouseName", getWarehouseName())
- .toString();
- }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
index 2194983..7aa3416 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
@@ -1,6 +1,11 @@
package com.ruoyi.search.ViewStockoutHistory.domain;
import java.math.BigDecimal;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -12,6 +17,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author gw
* @date 2025-09-19
*/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
public class ViewStockoutHistory extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -20,41 +29,41 @@ public class ViewStockoutHistory extends BaseEntity
@Excel(name = "出库单号")
private String stockoutId;
+ /** 出库子单号 */
+ @Excel(name = "出库子单号")
+ private String stockoutDetailId;
+
/** 出库类型 */
- @Excel(name = "出库类型")
+ @Excel(name = "出库类型",dictType = "out_bill_type")
private String outType;
/** 创建日期 */
@Excel(name = "创建日期")
private String createDate;
- /** 创建人ID */
- @Excel(name = "创建人ID")
+ /** 创建人 */
+ @Excel(name = "创建人")
private String createManId;
- /** 出库状态 */
- @Excel(name = "出库状态")
- private String status;
+ /** 订单号 */
+ @Excel(name = "订单号")
+ private String erpStockoutId;
- /** 出库来源 */
- @Excel(name = "出库来源")
- private String stockoutSource;
+ /** 物料编码 */
+ @Excel(name = "物料编码")
+ private String productId;
+
+ /** 物料名称 */
+ @Excel(name = "物料名称")
+ private String productName;
/** 出口 */
@Excel(name = "出口")
private String exitId;
- /** 仓库ID */
- @Excel(name = "仓库ID")
- private String warehouseId;
-
- /** 出库明细ID */
- @Excel(name = "出库明细ID")
- private String stockoutDetailId;
-
- /** 批次号 */
- @Excel(name = "批次号")
- private String lotNo;
+ /** 出库状态 */
+ @Excel(name = "出库状态",dictType = "out_bill_status")
+ private String status;
/** 出库数量 */
@Excel(name = "出库数量")
@@ -64,16 +73,26 @@ public class ViewStockoutHistory extends BaseEntity
@Excel(name = "分配数量")
private BigDecimal allotQuantity;
+ /** 批次号 */
+ @Excel(name = "批次号")
+ private String lotNo;
+
+ /** 出库来源 */
+// @Excel(name = "出库来源")
+ private String stockoutSource;
+
+
+ /** 仓库ID */
+// @Excel(name = "仓库ID")
+ private String warehouseId;
+
/** 分配编号 */
- @Excel(name = "分配编号")
+// @Excel(name = "分配编号")
private BigDecimal assignNum;
- /** ERP出库单ID */
- @Excel(name = "ERP出库单ID")
- private String erpStockoutId;
/** 客户编号 */
- @Excel(name = "客户编号")
+// @Excel(name = "客户编号")
private String entryid;
/** 客户名称 */
@@ -81,15 +100,13 @@ public class ViewStockoutHistory extends BaseEntity
private String customerName;
/** 物料主键 */
- @Excel(name = "物料主键")
+// @Excel(name = "物料主键")
private String productGuid;
- /** 物料编码 */
- @Excel(name = "物料编码")
- private String productId;
+
/** 产品分类 */
- @Excel(name = "产品分类")
+// @Excel(name = "产品分类")
private String parentId;
/** 品号描述 */
@@ -132,10 +149,6 @@ public class ViewStockoutHistory extends BaseEntity
@Excel(name = "功率")
private String spare6;
- /** 物料名称 */
- @Excel(name = "物料名称")
- private String productName;
-
/** 相位 */
@Excel(name = "相位")
private String spare7;
@@ -267,704 +280,9 @@ public class ViewStockoutHistory extends BaseEntity
/** 包装材积 */
@Excel(name = "包装材积")
private String spare39;
+ /** 描述 */
+ @Excel(name = "描述")
+ private String remark;
- public void setStockoutId(String stockoutId)
- {
- this.stockoutId = stockoutId;
- }
- public String getStockoutId()
- {
- return stockoutId;
- }
-
- public void setOutType(String outType)
- {
- this.outType = outType;
- }
-
- public String getOutType()
- {
- return outType;
- }
-
- public void setCreateDate(String createDate)
- {
- this.createDate = createDate;
- }
-
- public String getCreateDate()
- {
- return createDate;
- }
-
- public void setCreateManId(String createManId)
- {
- this.createManId = createManId;
- }
-
- public String getCreateManId()
- {
- return createManId;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStockoutSource(String stockoutSource)
- {
- this.stockoutSource = stockoutSource;
- }
-
- public String getStockoutSource()
- {
- return stockoutSource;
- }
-
- public void setExitId(String exitId)
- {
- this.exitId = exitId;
- }
-
- public String getExitId()
- {
- return exitId;
- }
-
- public void setWarehouseId(String warehouseId)
- {
- this.warehouseId = warehouseId;
- }
-
- public String getWarehouseId()
- {
- return warehouseId;
- }
-
- public void setStockoutDetailId(String stockoutDetailId)
- {
- this.stockoutDetailId = stockoutDetailId;
- }
-
- public String getStockoutDetailId()
- {
- return stockoutDetailId;
- }
-
- public void setLotNo(String lotNo)
- {
- this.lotNo = lotNo;
- }
-
- public String getLotNo()
- {
- return lotNo;
- }
-
- public void setQuantity(BigDecimal quantity)
- {
- this.quantity = quantity;
- }
-
- public BigDecimal getQuantity()
- {
- return quantity;
- }
-
- public void setAllotQuantity(BigDecimal allotQuantity)
- {
- this.allotQuantity = allotQuantity;
- }
-
- public BigDecimal getAllotQuantity()
- {
- return allotQuantity;
- }
-
- public void setAssignNum(BigDecimal assignNum)
- {
- this.assignNum = assignNum;
- }
-
- public BigDecimal getAssignNum()
- {
- return assignNum;
- }
-
- public void setErpStockoutId(String erpStockoutId)
- {
- this.erpStockoutId = erpStockoutId;
- }
-
- public String getErpStockoutId()
- {
- return erpStockoutId;
- }
-
- public void setEntryid(String entryid)
- {
- this.entryid = entryid;
- }
-
- public String getEntryid()
- {
- return entryid;
- }
-
- public void setCustomerName(String customerName)
- {
- this.customerName = customerName;
- }
-
- public String getCustomerName()
- {
- return customerName;
- }
-
- public void setProductGuid(String productGuid)
- {
- this.productGuid = productGuid;
- }
-
- public String getProductGuid()
- {
- return productGuid;
- }
-
- public void setProductId(String productId)
- {
- this.productId = productId;
- }
-
- public String getProductId()
- {
- return productId;
- }
-
- public void setParentId(String parentId)
- {
- this.parentId = parentId;
- }
-
- public String getParentId()
- {
- return parentId;
- }
-
- public void setPrice(String price)
- {
- this.price = price;
- }
-
- public String getPrice()
- {
- return price;
- }
-
- public void setCargoNo(String cargoNo)
- {
- this.cargoNo = cargoNo;
- }
-
- public String getCargoNo()
- {
- return cargoNo;
- }
-
- public void setUnit(String unit)
- {
- this.unit = unit;
- }
-
- public String getUnit()
- {
- return unit;
- }
-
- public void setSpec(String spec)
- {
- this.spec = spec;
- }
-
- public String getSpec()
- {
- return spec;
- }
-
- public void setSpare1(String spare1)
- {
- this.spare1 = spare1;
- }
-
- public String getSpare1()
- {
- return spare1;
- }
-
- public void setSpare2(String spare2)
- {
- this.spare2 = spare2;
- }
-
- public String getSpare2()
- {
- return spare2;
- }
-
- public void setSpare3(String spare3)
- {
- this.spare3 = spare3;
- }
-
- public String getSpare3()
- {
- return spare3;
- }
-
- public void setSpare4(String spare4)
- {
- this.spare4 = spare4;
- }
-
- public String getSpare4()
- {
- return spare4;
- }
-
- public void setSpare5(String spare5)
- {
- this.spare5 = spare5;
- }
-
- public String getSpare5()
- {
- return spare5;
- }
-
- public void setSpare6(String spare6)
- {
- this.spare6 = spare6;
- }
-
- public String getSpare6()
- {
- return spare6;
- }
-
- public void setProductName(String productName)
- {
- this.productName = productName;
- }
-
- public String getProductName()
- {
- return productName;
- }
-
- public void setSpare7(String spare7)
- {
- this.spare7 = spare7;
- }
-
- public String getSpare7()
- {
- return spare7;
- }
-
- public void setSpare8(String spare8)
- {
- this.spare8 = spare8;
- }
-
- public String getSpare8()
- {
- return spare8;
- }
-
- public void setSpare9(String spare9)
- {
- this.spare9 = spare9;
- }
-
- public String getSpare9()
- {
- return spare9;
- }
-
- public void setSpare10(String spare10)
- {
- this.spare10 = spare10;
- }
-
- public String getSpare10()
- {
- return spare10;
- }
-
- public void setSpare11(String spare11)
- {
- this.spare11 = spare11;
- }
-
- public String getSpare11()
- {
- return spare11;
- }
-
- public void setSpare12(String spare12)
- {
- this.spare12 = spare12;
- }
-
- public String getSpare12()
- {
- return spare12;
- }
-
- public void setSpare13(String spare13)
- {
- this.spare13 = spare13;
- }
-
- public String getSpare13()
- {
- return spare13;
- }
-
- public void setSpare14(String spare14)
- {
- this.spare14 = spare14;
- }
-
- public String getSpare14()
- {
- return spare14;
- }
-
- public void setSpare15(String spare15)
- {
- this.spare15 = spare15;
- }
-
- public String getSpare15()
- {
- return spare15;
- }
-
- public void setSpare16(String spare16)
- {
- this.spare16 = spare16;
- }
-
- public String getSpare16()
- {
- return spare16;
- }
-
- public void setSpare17(String spare17)
- {
- this.spare17 = spare17;
- }
-
- public String getSpare17()
- {
- return spare17;
- }
-
- public void setSpare18(String spare18)
- {
- this.spare18 = spare18;
- }
-
- public String getSpare18()
- {
- return spare18;
- }
-
- public void setSpare19(String spare19)
- {
- this.spare19 = spare19;
- }
-
- public String getSpare19()
- {
- return spare19;
- }
-
- public void setSpare20(String spare20)
- {
- this.spare20 = spare20;
- }
-
- public String getSpare20()
- {
- return spare20;
- }
-
- public void setSpare21(String spare21)
- {
- this.spare21 = spare21;
- }
-
- public String getSpare21()
- {
- return spare21;
- }
-
- public void setSpare22(String spare22)
- {
- this.spare22 = spare22;
- }
-
- public String getSpare22()
- {
- return spare22;
- }
-
- public void setSpare23(String spare23)
- {
- this.spare23 = spare23;
- }
-
- public String getSpare23()
- {
- return spare23;
- }
-
- public void setSpare24(String spare24)
- {
- this.spare24 = spare24;
- }
-
- public String getSpare24()
- {
- return spare24;
- }
-
- public void setSpare25(String spare25)
- {
- this.spare25 = spare25;
- }
-
- public String getSpare25()
- {
- return spare25;
- }
-
- public void setSpare26(String spare26)
- {
- this.spare26 = spare26;
- }
-
- public String getSpare26()
- {
- return spare26;
- }
-
- public void setSpare27(String spare27)
- {
- this.spare27 = spare27;
- }
-
- public String getSpare27()
- {
- return spare27;
- }
-
- public void setSpare28(String spare28)
- {
- this.spare28 = spare28;
- }
-
- public String getSpare28()
- {
- return spare28;
- }
-
- public void setSpare29(String spare29)
- {
- this.spare29 = spare29;
- }
-
- public String getSpare29()
- {
- return spare29;
- }
-
- public void setSpare30(String spare30)
- {
- this.spare30 = spare30;
- }
-
- public String getSpare30()
- {
- return spare30;
- }
-
- public void setSpare31(String spare31)
- {
- this.spare31 = spare31;
- }
-
- public String getSpare31()
- {
- return spare31;
- }
-
- public void setSpare32(String spare32)
- {
- this.spare32 = spare32;
- }
-
- public String getSpare32()
- {
- return spare32;
- }
-
- public void setSpare33(String spare33)
- {
- this.spare33 = spare33;
- }
-
- public String getSpare33()
- {
- return spare33;
- }
-
- public void setSpare34(String spare34)
- {
- this.spare34 = spare34;
- }
-
- public String getSpare34()
- {
- return spare34;
- }
-
- public void setSpare35(String spare35)
- {
- this.spare35 = spare35;
- }
-
- public String getSpare35()
- {
- return spare35;
- }
-
- public void setSpare36(String spare36)
- {
- this.spare36 = spare36;
- }
-
- public String getSpare36()
- {
- return spare36;
- }
-
- public void setSpare37(String spare37)
- {
- this.spare37 = spare37;
- }
-
- public String getSpare37()
- {
- return spare37;
- }
-
- public void setSpare38(String spare38)
- {
- this.spare38 = spare38;
- }
-
- public String getSpare38()
- {
- return spare38;
- }
-
- public void setSpare39(String spare39)
- {
- this.spare39 = spare39;
- }
-
- public String getSpare39()
- {
- return spare39;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("stockoutId", getStockoutId())
- .append("outType", getOutType())
- .append("createDate", getCreateDate())
- .append("createManId", getCreateManId())
- .append("status", getStatus())
- .append("stockoutSource", getStockoutSource())
- .append("exitId", getExitId())
- .append("warehouseId", getWarehouseId())
- .append("stockoutDetailId", getStockoutDetailId())
- .append("lotNo", getLotNo())
- .append("quantity", getQuantity())
- .append("allotQuantity", getAllotQuantity())
- .append("assignNum", getAssignNum())
- .append("erpStockoutId", getErpStockoutId())
- .append("entryid", getEntryid())
- .append("customerName", getCustomerName())
- .append("productGuid", getProductGuid())
- .append("productId", getProductId())
- .append("parentId", getParentId())
- .append("price", getPrice())
- .append("cargoNo", getCargoNo())
- .append("unit", getUnit())
- .append("spec", getSpec())
- .append("remark", getRemark())
- .append("spare1", getSpare1())
- .append("spare2", getSpare2())
- .append("spare3", getSpare3())
- .append("spare4", getSpare4())
- .append("spare5", getSpare5())
- .append("spare6", getSpare6())
- .append("productName", getProductName())
- .append("spare7", getSpare7())
- .append("spare8", getSpare8())
- .append("spare9", getSpare9())
- .append("spare10", getSpare10())
- .append("spare11", getSpare11())
- .append("spare12", getSpare12())
- .append("spare13", getSpare13())
- .append("spare14", getSpare14())
- .append("spare15", getSpare15())
- .append("spare16", getSpare16())
- .append("spare17", getSpare17())
- .append("spare18", getSpare18())
- .append("spare19", getSpare19())
- .append("spare20", getSpare20())
- .append("spare21", getSpare21())
- .append("spare22", getSpare22())
- .append("spare23", getSpare23())
- .append("spare24", getSpare24())
- .append("spare25", getSpare25())
- .append("spare26", getSpare26())
- .append("spare27", getSpare27())
- .append("spare28", getSpare28())
- .append("spare29", getSpare29())
- .append("spare30", getSpare30())
- .append("spare31", getSpare31())
- .append("spare32", getSpare32())
- .append("spare33", getSpare33())
- .append("spare34", getSpare34())
- .append("spare35", getSpare35())
- .append("spare36", getSpare36())
- .append("spare37", getSpare37())
- .append("spare38", getSpare38())
- .append("spare39", getSpare39())
- .toString();
- }
}
diff --git a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
index 5c0465e..4a8d152 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
p.product_id,
p.product_name,
+ s.order_id,
p.spec,
p.unit,
p.price,
@@ -98,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND p.product_id IS NOT NULL AND p.product_id != ''
AND p.product_id like concat('%', #{productId}, '%')
AND p.product_name like concat('%', #{productName}, '%')
+ AND s.order_id like concat('%', #{orderId}, '%')
AND p.spec like concat('%', #{spec}, '%')
AND p.unit like concat('%', #{unit}, '%')
AND p.price like concat('%', #{price}, '%')
@@ -111,6 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND s.lot_no like concat('%', #{lotNo}, '%')
AND s.warehouse_id like concat('%', #{warehouseId}, '%')
AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')
+ AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')
+ AND p.spare9 like concat('%', #{spare9}, '%')
${params.warehouseDataScope}
@@ -119,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
,p.product_id
,p.product_name
+ ,s.order_id
,p.spec
,p.unit
,p.price
@@ -180,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND p.product_id IS NOT NULL AND p.product_id != ''
AND p.product_id like concat('%', #{productId}, '%')
AND p.product_name like concat('%', #{productName}, '%')
+ AND s.order_id like concat('%', #{orderId}, '%')
AND p.spec like concat('%', #{spec}, '%')
AND p.unit like concat('%', #{unit}, '%')
AND p.price like concat('%', #{price}, '%')
@@ -228,6 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND s.lot_no like concat('%', #{lotNo}, '%')
AND s.warehouse_id like concat('%', #{warehouseId}, '%')
AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')
+ AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')
${params.warehouseDataScope}
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
index 8d9c2a3..bca46cc 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
@@ -79,10 +79,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, wlbh, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from view_in_job_flow
+ select job_id, job_detail_id,line_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, wlbh, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from view_in_job_flow
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
index ca55b40..9c94e5f 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
@@ -81,10 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, wlbh, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, customer_name from view_out_job_flow
+ select job_id, job_detail_id,line_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, wlbh, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, customer_name from view_out_job_flow
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
index 1160bb2..3b8f10a 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -49,7 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
s.stockin_detail_id,
s.in_date,
s.warehouse_id,
- s.stacking_id,
+ s.stacking_id,
+ s.order_id,
cs.cargo_space_name,
cs.roadway_id,
cs.status AS cargo_space_status,
@@ -81,9 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"