lhq/FT517-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询统计修改

Browse Source
This commit is contained in:
猫猫guowen
2025-10-15 16:05:58 +08:00
parent f43c6782a6
commit 597f92b566
19 changed files with 1838 additions and 4158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java
View File

@@ -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 */

37
ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
View File

@@ -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("<br>");
info.append(MessageUtils.message("kpi.spacePlan.TheTypeName")).append(space.getTheTypeName()).append("<br>");
info.append(MessageUtils.message("kpi.spacePlan.Locked")).append("Y".equals(space.getLocked()) ? MessageUtils.message("kpi.spacePlan.Y") : MessageUtils.message("kpi.spacePlan.N")).append("<br>");
info.append(MessageUtils.message("kpi.spacePlan.TrayCode")).append(space.getTrayCode() != null ? space.getTrayCode() : MessageUtils.message("kpi.spacePlan.W")).append("<br>");
info.append(MessageUtils.message("kpi.spacePlan.CargoHight")).append(space.getCargoHight() != null ? space.getCargoHight() : MessageUtils.message("kpi.spacePlan.W")).append("<br>");
info.append(MessageUtils.message("kpi.spacePlan.IssDouble")).append("Y".equals(space.getIssDouble()) ? MessageUtils.message("kpi.spacePlan.Y") : MessageUtils.message("kpi.spacePlan.N")).append("<br>");
info.append("货位名称：").append(space.getCargoSpaceName()).append("<br>");
info.append("是否锁定：").append("Y".equals(space.getLocked()) ? "是" : "否").append("<br>");
info.append("托盘条码：").append(space.getTrayCode() != null ? space.getTrayCode() : "无").append("<br>");
// 根据cargoSpaceId查询BasStock表，获取productId和productName
BasStock stockQuery = new BasStock();
stockQuery.setCargoSpaceId(space.getCargoSpaceId());
List<BasStock> stockList = basStockMapper.selectBasStockList(stockQuery);
if (!stockList.isEmpty()) {
BasStock stock = stockList.get(0);
info.append("物料编码：").append(stock.getProductId() != null ? stock.getProductId() : "无").append("<br>");
info.append("物料名称：").append(stock.getProductName() != null ? stock.getProductName() : "无").append("<br>");
}
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<String,Object> res = new HashMap<>();
MydoJob mydoJobParam = new MydoJob();
mydoJobParam.setWarehouseId(warehouseId);
// 直接查询创建时间是否在startTime与endTime之间
mydoJobParam.setCreateLeftTime(startTime);
mydoJobParam.setCreateRightTime(endTime);
mydoJobParam.setInOut(inOut);
List<DateTime> datesBetween = DateUtil.rangeToList(DateUtil.parseDate(mydoJobParam.getCreateLeftTime()), DateUtil.parseDate(mydoJobParam.getCreateRightTime()), DateField.DAY_OF_MONTH);
List<DateTime> datesBetween = DateUtil.rangeToList(DateUtil.parseDate(startTime), DateUtil.parseDate(endTime), DateField.DAY_OF_MONTH);
List<MydoJob> 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<String> roadwayIds = Arrays.asList("1", "2");

11
ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
View File

@@ -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;

1224
ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
View File

File diff suppressed because it is too large Load Diff

942
ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
View File

File diff suppressed because it is too large Load Diff

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

@@ -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 + '\'' +
'}';
}
}

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

File diff suppressed because it is too large Load Diff

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

@@ -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();
}
}

8
ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
View File

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="onlyIdentity" column="only_identity" />
<result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="orderId" column="order_id" />
<result property="spec" column="spec" />
<result property="unit" column="unit" />
<result property="lotNo" column="lot_no" />
@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupBySpec != null and groupBySpec or groupByUnit != null and groupByUnit or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByCargoSpaceId != null and groupByCargoSpaceId or groupByPrice != null and groupByPrice or groupByParentId != null and groupByParentId or groupByCargoNo != null and groupByCargoNo or groupBySpare1 != null and groupBySpare1 or groupBySpare2 != null and groupBySpare2 or groupBySpare3 != null and groupBySpare3 or groupBySpare4 != null and groupBySpare4 or groupBySpare5 != null and groupBySpare5 or groupBySpare6 != null and groupBySpare6 or groupBySpare7 != null and groupBySpare7 or groupBySpare8 != null and groupBySpare8 or groupBySpare9 != null and groupBySpare9 or groupBySpare10 != null and groupBySpare10">
<if test="groupByProductId != null and groupByProductId">p.product_id,</if>
<if test="groupByProductName != null and groupByProductName">p.product_name,</if>
<if test="groupByOrderId != null and groupByOrderId">s.order_id,</if>
<if test="groupBySpec != null and groupBySpec">p.spec,</if>
<if test="groupByUnit != null and groupByUnit">p.unit,</if>
<if test="groupByPrice != null and groupByPrice">p.price,</if>
@@ -98,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND p.product_id IS NOT NULL AND p.product_id != ''
<if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
<if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
<if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
@@ -111,6 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="spare9 != null and spare9 != ''"> AND p.spare9 like concat('%', #{spare9}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
@@ -119,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefixOverrides=",">
<if test="groupByProductId != null and groupByProductId">,p.product_id</if>
<if test="groupByProductName != null and groupByProductName">,p.product_name</if>
<if test="groupByOrderId != null and groupByOrderId">,s.order_id</if>
<if test="groupBySpec != null and groupBySpec">,p.spec</if>
<if test="groupByUnit != null and groupByUnit">,p.unit</if>
<if test="groupByPrice != null and groupByPrice">,p.price</if>
@@ -180,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND p.product_id IS NOT NULL AND p.product_id != ''
<if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
<if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
<if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
@@ -228,6 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>

4
ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
View File

@@ -79,10 +79,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare37" column="spare37" />
<result property="spare38" column="spare38" />
<result property="spare39" column="spare39" />
<result property="lineId" column="line_id" />
</resultMap>
<sql id="selectViewInJobFlowVo">
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
</sql>
<select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
@@ -162,6 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare37 != null and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
<if test="spare38 != null and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
<if test="spare39 != null and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
<if test="lineId != null and lineId != ''"> and line_id like concat('%', #{lineId}, '%')</if>
</where>
</select>

4
ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
View File

@@ -81,10 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare38" column="spare38" />
<result property="spare39" column="spare39" />
<result property="customerName" column="customer_name" />
<result property="lineId" column="line_id" />
</resultMap>
<sql id="selectViewOutJobFlowVo">
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
</sql>
<select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">
@@ -166,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare38 != null and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
<if test="spare39 != null and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="lineId != null and lineId != ''"> and line_id like concat('%', #{lineId}, '%')</if>
</where>
</select>

11
ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
View File

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseName" column="warehouse_name" />
<result property="stockStatus" column="stock_status" />
<result property="productStatus" column="product_status" />
<result property="orderId" column="order_id" />
</resultMap>
<sql id="selectViewStockDetailVo">
@@ -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"
<select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
<include refid="selectViewStockDetailVo"/>
<if test="stockId != null and stockId != ''"> and s.stock_id = #{stockId}</if>
<if test="stockId != null and stockId != ''"> and s.stock_id like concat('%',#{stockId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and s.cargo_space_id = #{cargoSpaceId}</if>
<if test="trayCode != null and trayCode != ''"> and s.tray_code = #{trayCode}</if>
<if test="trayCode != null and trayCode != ''"> and s.tray_code like concat('%',#{trayCode}, '%')</if>
<if test="quantity != null and quantity != ''"> and s.quantity = #{quantity}</if>
<if test="jobId != null and jobId != ''"> and s.job_id = #{jobId}</if>
<if test="lotNo != null and lotNo != ''"> and s.lot_no = #{lotNo}</if>
@@ -98,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stockStatus != null and stockStatus != ''"> and s.stock_status = #{stockStatus}</if>
<if test="productStatus != null and productStatus != ''"> and s.product_status = #{productStatus}</if>
<if test="locked != null and locked != ''"> and cs.locked = #{locked}</if>
<if test="productId != null and productId != ''"> and p.product_id = #{productId}</if>
<if test="productId != null and productId != ''"> and p.product_id like concat('%',#{productId}, '%')</if>
<if test="productName != null and productName != ''"> and p.product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> and p.spec = #{spec}</if>
<if test="unit != null and unit != ''"> and p.unit = #{unit}</if>
@@ -110,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare7 != null and spare7 != ''"> and p.spare7 = #{spare7}</if>
<if test="spare8 != null and spare8 != ''"> and p.spare8 = #{spare8}</if>
<if test="remark != null and remark != ''"> and p.remark = #{remark}</if>
<if test="orderId != null and orderId != ''"> and s.order_id like concat('%',#{orderId}, '%')</if>
</select>
<select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">