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-09-22 16:51:05 +08:00
parent e51994a6ec
commit 63df466a45
51 changed files with 13539 additions and 4522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,10 @@ package com.ruoyi.search.StockSummary.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;
/**
* 库存汇总对象 stock_summary
@@ -9,6 +13,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2025-05-26
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ToString
public class StockSummary extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -18,71 +26,212 @@ public class StockSummary extends BaseEntity
private Long onlyIdentity;
/** 物料编码 */
@Excel(name = "${search.StockSummary.productId}")
@Excel(name = "物料编码")
private String productId;
/** 物料名称 */
@Excel(name = "${search.StockSummary.productName}")
@Excel(name = "物料名称")
private String productName;
/** 规格 */
// @Excel(name = "${search.StockSummary.spec}")
@Excel(name = "规格")
private String spec;
/** 单位 */
@Excel(name = "${search.StockSummary.unit}")
@Excel(name = "单位")
private String unit;
/** 批号 */
// @Excel(name = "${search.StockSummary.lotNo}")
@Excel(name = "批号")
private String lotNo;
/** 仓库 */
private String warehouseId;
@Excel(name = "${search.StockSummary.warehouseName}")
@Excel(name = "仓库")
private String warehouseName;
@Excel(name = "${search.StockSummary.cargoSpaceName}")
@Excel(name = "货位")
private String cargoSpaceName;
/** 巷道 */
@Excel(name = "巷道")
private String roadwayId;
/** 库存数量 */
@Excel(name = "${search.StockSummary.quantity}")
@Excel(name = "库存数量")
private Double quantity;
/** 价格 */
// @Excel(name = "${search.StockSummary.price}")
@Excel(name = "价格")
private String price;
/** 英文名称 */
@Excel(name = "${search.StockSummary.spare1}")
/** 产品分类 */
@Excel(name = "产品分类")
private String parentId;
/** 英文描述 */
@Excel(name = "英文描述")
private String cargoNo;
/** 型号 */
@Excel(name = "型号")
private String spare1;
/** 单件净重 */
@Excel(name = "${search.StockSummary.spare2}")
@Excel(name = "单件净重")
private String spare2;
/** 长MM */
@Excel(name = "${search.StockSummary.spare5}")
/** 颜色 */
@Excel(name = "颜色")
private String spare3;
/** 序列号 */
@Excel(name = "序列号")
private String spare4;
/** 电压 */
@Excel(name = "电压")
private String spare5;
/** 宽MM */
@Excel(name = "${search.StockSummary.spare6}")
/** 功率 */
@Excel(name = "功率")
private String spare6;
/** 高MM */
@Excel(name = "${search.StockSummary.spare7}")
/** 相位 */
@Excel(name = "相位")
private String spare7;
/** 体积m³ */
@Excel(name = "${search.StockSummary.spare8}")
/** 毛重 */
@Excel(name = "毛重")
private String spare8;
/** NC号 */
@Excel(name = "NC号")
private String spare9;
/** 电源线 */
@Excel(name = "电源线")
private String spare10;
/** 插头 */
@Excel(name = "插头")
private String spare11;
/** 接嘴 */
@Excel(name = "接嘴")
private String spare12;
/** 快捷码 */
@Excel(name = "快捷码")
private String spare13;
/** 库存单位编号 */
@Excel(name = "库存单位编号")
private String spare14;
/** 库存单位名称 */
@Excel(name = "库存单位名称")
private String spare15;
/** 品号群组 */
@Excel(name = "品号群组")
private String spare16;
/** 归类品 */
@Excel(name = "归类品")
private String spare17;
/** 计量体系 */
@Excel(name = "计量体系")
private String spare18;
/** 群组名称 */
@Excel(name = "群组名称")
private String spare19;
/** 批号管理 */
@Excel(name = "批号管理")
private String spare20;
/** 状态 */
@Excel(name = "状态")
private String spare21;
/** 产品大类 */
@Excel(name = "产品大类")
private String spare22;
/** 产品二类 */
@Excel(name = "产品二类")
private String spare23;
/** 产品线/产品系列（组码） */
@Excel(name = "产品线/产品系列")
private String spare24;
/** BOM状态（组码） */
@Excel(name = "BOM状态")
private String spare25;
/** 产品定位（组码） */
@Excel(name = "产品定位")
private String spare26;
/** 电脑板型号（组码） */
@Excel(name = "电脑板型号")
private String spare27;
/** 非标要求 */
@Excel(name = "非标要求")
private String spare28;
/** 品牌（组码） */
@Excel(name = "品牌")
private String spare29;
/** 非标颜色 */
@Excel(name = "非标颜色")
private String spare30;
/** 主颜色 */
@Excel(name = "主颜色")
private String spare31;
/** 辅助颜色 */
@Excel(name = "辅助颜色")
private String spare32;
/** 是否标准款（组码） */
@Excel(name = "是否标准款")
private String spare33;
/** 包装方式 */
@Excel(name = "包装方式")
private String spare34;
/** 主要包装方式 */
@Excel(name = "主要包装方式")
private String spare35;
/** 长 */
@Excel(name = "长")
private String spare36;
/** 宽 */
@Excel(name = "宽")
private String spare37;
/** 高 */
@Excel(name = "高")
private String spare38;
/** 包装材积 */
@Excel(name = "包装材积")
private String spare39;
/** 备注 */
@Excel(name = "${search.StockSummary.remark}")
@Excel(name = "备注")
private String remark;
private String cargoSpaceId;
@@ -97,348 +246,48 @@ public class StockSummary extends BaseEntity
private Boolean groupByWarehouseId;
private Boolean groupByRoadwayId;
private Boolean groupByPrice;
private Boolean groupByParentId;
private Boolean groupByCargoNo;
private Boolean groupBySpare1;
private Boolean groupBySpare2;
private Boolean groupBySpare3;
private Boolean groupBySpare4;
private Boolean groupBySpare5;
private Boolean groupBySpare6;
private Boolean groupBySpare7;
private Boolean groupBySpare8;
private Boolean groupBySpare9;
private Boolean groupBySpare10;
private Boolean groupBySpare11;
private Boolean groupBySpare12;
private Boolean groupBySpare13;
private Boolean groupBySpare14;
private Boolean groupBySpare15;
private Boolean groupBySpare16;
private Boolean groupBySpare17;
private Boolean groupBySpare18;
private Boolean groupBySpare19;
private Boolean groupBySpare20;
private Boolean groupBySpare21;
private Boolean groupBySpare22;
private Boolean groupBySpare23;
private Boolean groupBySpare24;
private Boolean groupBySpare25;
private Boolean groupBySpare26;
private Boolean groupBySpare27;
private Boolean groupBySpare28;
private Boolean groupBySpare29;
private Boolean groupBySpare30;
private Boolean groupBySpare31;
private Boolean groupBySpare32;
private Boolean groupBySpare33;
private Boolean groupBySpare34;
private Boolean groupBySpare35;
private Boolean groupBySpare36;
private Boolean groupBySpare37;
private Boolean groupBySpare38;
private Boolean groupBySpare39;
private Boolean groupByCargoSpaceId;
public String getCargoSpaceName() {
return cargoSpaceName;
}
public void setCargoSpaceName(String cargoSpaceName) {
this.cargoSpaceName = cargoSpaceName;
}
public String getCargoSpaceId() {
return cargoSpaceId;
}
public void setCargoSpaceId(String cargoSpaceId) {
this.cargoSpaceId = cargoSpaceId;
}
public Boolean getGroupByCargoSpaceId() {
return groupByCargoSpaceId;
}
public void setGroupByCargoSpaceId(Boolean groupByCargoSpaceId) {
this.groupByCargoSpaceId = groupByCargoSpaceId;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
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;
}
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public Boolean getGroupByPrice() {
return groupByPrice;
}
public void setGroupByPrice(Boolean groupByPrice) {
this.groupByPrice = groupByPrice;
}
public Boolean getGroupBySpare1() {
return groupBySpare1;
}
public void setGroupBySpare1(Boolean groupBySpare1) {
this.groupBySpare1 = groupBySpare1;
}
public Boolean getGroupBySpare2() {
return groupBySpare2;
}
public void setGroupBySpare2(Boolean groupBySpare2) {
this.groupBySpare2 = groupBySpare2;
}
public Boolean getGroupBySpare5() {
return groupBySpare5;
}
public void setGroupBySpare5(Boolean groupBySpare5) {
this.groupBySpare5 = groupBySpare5;
}
public Boolean getGroupBySpare6() {
return groupBySpare6;
}
public void setGroupBySpare6(Boolean groupBySpare6) {
this.groupBySpare6 = groupBySpare6;
}
public Boolean getGroupBySpare7() {
return groupBySpare7;
}
public void setGroupBySpare7(Boolean groupBySpare7) {
this.groupBySpare7 = groupBySpare7;
}
public Boolean getGroupBySpare8() {
return groupBySpare8;
}
public void setGroupBySpare8(Boolean groupBySpare8) {
this.groupBySpare8 = groupBySpare8;
}
public Boolean getGroupByProductId() {
return groupByProductId;
}
public void setGroupByProductId(Boolean groupByProductId) {
this.groupByProductId = groupByProductId;
}
public Boolean getGroupByProductName() {
return groupByProductName;
}
public void setGroupByProductName(Boolean groupByProductName) {
this.groupByProductName = groupByProductName;
}
public Boolean getGroupBySpec() {
return groupBySpec;
}
public void setGroupBySpec(Boolean groupBySpec) {
this.groupBySpec = groupBySpec;
}
public Boolean getGroupByUnit() {
return groupByUnit;
}
public void setGroupByUnit(Boolean groupByUnit) {
this.groupByUnit = groupByUnit;
}
public Boolean getGroupByLotNo() {
return groupByLotNo;
}
public void setGroupByLotNo(Boolean groupByLotNo) {
this.groupByLotNo = groupByLotNo;
}
public Boolean getGroupByWarehouseId() {
return groupByWarehouseId;
}
public void setGroupByWarehouseId(Boolean groupByWarehouseId) {
this.groupByWarehouseId = groupByWarehouseId;
}
public Boolean getGroupByRoadwayId() {
return groupByRoadwayId;
}
public void setGroupByRoadwayId(Boolean groupByRoadwayId) {
this.groupByRoadwayId = groupByRoadwayId;
}
public void setOnlyIdentity(Long onlyIdentity)
{
this.onlyIdentity = onlyIdentity;
}
public Long getOnlyIdentity()
{
return onlyIdentity;
}
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 setLotNo(String lotNo)
{
this.lotNo = lotNo;
}
public String getLotNo()
{
return lotNo;
}
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId()
{
return warehouseId;
}
public void setRoadwayId(String roadwayId)
{
this.roadwayId = roadwayId;
}
public String getRoadwayId()
{
return roadwayId;
}
public void setQuantity(Double quantity)
{
this.quantity = quantity;
}
public Double getQuantity()
{
return quantity;
}
@Override
public String toString() {
return "StockSummary{" +
"onlyIdentity=" + onlyIdentity +
", productId='" + productId + '\'' +
", productName='" + productName + '\'' +
", spec='" + spec + '\'' +
", unit='" + unit + '\'' +
", lotNo='" + lotNo + '\'' +
", warehouseId='" + warehouseId + '\'' +
", roadwayId='" + roadwayId + '\'' +
", quantity=" + quantity +
", price='" + price + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
", groupByProductId=" + groupByProductId +
", groupByProductName=" + groupByProductName +
", groupBySpec=" + groupBySpec +
", groupByUnit=" + groupByUnit +
", groupByLotNo=" + groupByLotNo +
", groupByWarehouseId=" + groupByWarehouseId +
", groupByRoadwayId=" + groupByRoadwayId +
", groupByPrice=" + groupByPrice +
", groupBySpare1=" + groupBySpare1 +
", groupBySpare2=" + groupBySpare2 +
", groupBySpare5=" + groupBySpare5 +
", groupBySpare6=" + groupBySpare6 +
", groupBySpare7=" + groupBySpare7 +
", groupBySpare8=" + groupBySpare8 +
'}';
}
}

26
ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java
View File

@@ -1,25 +1,31 @@
package com.ruoyi.search.ViewInJobFlow.controller;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 入库作业流水Controller
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-22
*/
@RestController
@RequestMapping("/search/ViewInJobFlow")

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

File diff suppressed because it is too large Load Diff

21
ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java
View File

@@ -1,20 +1,19 @@
package com.ruoyi.search.ViewInJobFlow.mapper;
import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
import java.util.List;
import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
/**
* 入库作业流水Mapper接口
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-22
*/
public interface ViewInJobFlowMapper
public interface ViewInJobFlowMapper
{
/**
* 查询入库作业流水
*
*
* @param jobId 入库作业流水主键
* @return 入库作业流水
*/
@@ -22,7 +21,7 @@ public interface ViewInJobFlowMapper
/**
* 查询入库作业流水列表
*
*
* @param viewInJobFlow 入库作业流水
* @return 入库作业流水集合
*/
@@ -30,7 +29,7 @@ public interface ViewInJobFlowMapper
/**
* 新增入库作业流水
*
*
* @param viewInJobFlow 入库作业流水
* @return 结果
*/
@@ -38,7 +37,7 @@ public interface ViewInJobFlowMapper
/**
* 修改入库作业流水
*
*
* @param viewInJobFlow 入库作业流水
* @return 结果
*/
@@ -46,7 +45,7 @@ public interface ViewInJobFlowMapper
/**
* 删除入库作业流水
*
*
* @param jobId 入库作业流水主键
* @return 结果
*/
@@ -54,7 +53,7 @@ public interface ViewInJobFlowMapper
/**
* 批量删除入库作业流水
*
*
* @param jobIds 需要删除的数据主键集合
* @return 结果
*/

21
ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java
View File

@@ -1,20 +1,19 @@
package com.ruoyi.search.ViewInJobFlow.service;
import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
import java.util.List;
import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
/**
* 入库作业流水Service接口
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-22
*/
public interface IViewInJobFlowService
public interface IViewInJobFlowService
{
/**
* 查询入库作业流水
*
*
* @param jobId 入库作业流水主键
* @return 入库作业流水
*/
@@ -22,7 +21,7 @@ public interface IViewInJobFlowService
/**
* 查询入库作业流水列表
*
*
* @param viewInJobFlow 入库作业流水
* @return 入库作业流水集合
*/
@@ -30,7 +29,7 @@ public interface IViewInJobFlowService
/**
* 新增入库作业流水
*
*
* @param viewInJobFlow 入库作业流水
* @return 结果
*/
@@ -38,7 +37,7 @@ public interface IViewInJobFlowService
/**
* 修改入库作业流水
*
*
* @param viewInJobFlow 入库作业流水
* @return 结果
*/
@@ -46,7 +45,7 @@ public interface IViewInJobFlowService
/**
* 批量删除入库作业流水
*
*
* @param jobIds 需要删除的入库作业流水主键集合
* @return 结果
*/
@@ -54,7 +53,7 @@ public interface IViewInJobFlowService
/**
* 删除入库作业流水信息
*
*
* @param jobId 入库作业流水主键
* @return 结果
*/

29
ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java
View File

@@ -1,30 +1,28 @@
package com.ruoyi.search.ViewInJobFlow.service.impl;
import com.ruoyi.common.annotation.DataScope;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
import com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper;
import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper;
import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService;
/**
* 入库作业流水Service业务层处理
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-22
*/
@Service
public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
{
@Autowired
private ViewInJobFlowMapper viewInJobFlowMapper;
/**
* 查询入库作业流水
*
*
* @param jobId 入库作业流水主键
* @return 入库作业流水
*/
@@ -36,12 +34,11 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
/**
* 查询入库作业流水列表
*
*
* @param viewInJobFlow 入库作业流水
* @return 入库作业流水
*/
@Override
@DataScope(warehouseAlias = "vijf")
public List<ViewInJobFlow> selectViewInJobFlowList(ViewInJobFlow viewInJobFlow)
{
return viewInJobFlowMapper.selectViewInJobFlowList(viewInJobFlow);
@@ -49,7 +46,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
/**
* 新增入库作业流水
*
*
* @param viewInJobFlow 入库作业流水
* @return 结果
*/
@@ -62,7 +59,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
/**
* 修改入库作业流水
*
*
* @param viewInJobFlow 入库作业流水
* @return 结果
*/
@@ -74,7 +71,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
/**
* 批量删除入库作业流水
*
*
* @param jobIds 需要删除的入库作业流水主键
* @return 结果
*/
@@ -86,7 +83,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
/**
* 删除入库作业流水信息
*
*
* @param jobId 入库作业流水主键
* @return 结果
*/

50
ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java
View File

@@ -1,25 +1,31 @@
package com.ruoyi.search.ViewOutJobFlow.controller;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 出库做业务流水Controller
*
* 出库作业流水Controller
*
* @author gw
* @date 2025-05-29
* @date 2025-09-22
*/
@RestController
@RequestMapping("/search/ViewOutJobFlow")
@@ -29,7 +35,7 @@ public class ViewOutJobFlowController extends BaseController
private IViewOutJobFlowService viewOutJobFlowService;
/**
* 查询出库做业务流水列表
* 查询出库作业流水列表
*/
@PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:list')")
@GetMapping("/list")
@@ -41,20 +47,20 @@ public class ViewOutJobFlowController extends BaseController
}
/**
* 导出出库做业务流水列表
* 导出出库作业流水列表
*/
@PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:export')")
@Log(title = "出库做业务流水", businessType = BusinessType.EXPORT)
@Log(title = "出库作业流水", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ViewOutJobFlow viewOutJobFlow)
{
List<ViewOutJobFlow> list = viewOutJobFlowService.selectViewOutJobFlowList(viewOutJobFlow);
ExcelUtil<ViewOutJobFlow> util = new ExcelUtil<ViewOutJobFlow>(ViewOutJobFlow.class);
util.exportExcel(response, list, "出库做业务流水数据");
util.exportExcel(response, list, "出库作业流水数据");
}
/**
* 获取出库做业务流水详细信息
* 获取出库作业流水详细信息
*/
@PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:query')")
@GetMapping(value = "/{jobId}")
@@ -64,10 +70,10 @@ public class ViewOutJobFlowController extends BaseController
}
/**
* 新增出库做业务流水
* 新增出库作业流水
*/
@PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:add')")
@Log(title = "出库做业务流水", businessType = BusinessType.INSERT)
@Log(title = "出库作业流水", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ViewOutJobFlow viewOutJobFlow)
{
@@ -75,10 +81,10 @@ public class ViewOutJobFlowController extends BaseController
}
/**
* 修改出库做业务流水
* 修改出库作业流水
*/
@PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:edit')")
@Log(title = "出库做业务流水", businessType = BusinessType.UPDATE)
@Log(title = "出库作业流水", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ViewOutJobFlow viewOutJobFlow)
{
@@ -86,10 +92,10 @@ public class ViewOutJobFlowController extends BaseController
}
/**
* 删除出库做业务流水
* 删除出库作业流水
*/
@PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:remove')")
@Log(title = "出库做业务流水", businessType = BusinessType.DELETE)
@Log(title = "出库作业流水", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobIds}")
public AjaxResult remove(@PathVariable String[] jobIds)
{

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

File diff suppressed because it is too large Load Diff

49
ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java
View File

@@ -1,60 +1,59 @@
package com.ruoyi.search.ViewOutJobFlow.mapper;
import java.util.List;
import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
import java.util.List;
/**
* 出库做业务流水Mapper接口
*
* 出库作业流水Mapper接口
*
* @author gw
* @date 2025-05-29
* @date 2025-09-22
*/
public interface ViewOutJobFlowMapper
public interface ViewOutJobFlowMapper
{
/**
* 查询出库做业务流水
*
* @param jobId 出库做业务流水主键
* @return 出库做业务流水
* 查询出库作业流水
*
* @param jobId 出库作业流水主键
* @return 出库作业流水
*/
public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId);
/**
* 查询出库做业务流水列表
*
* @param viewOutJobFlow 出库做业务流水
* @return 出库做业务流水集合
* 查询出库作业流水列表
*
* @param viewOutJobFlow 出库作业流水
* @return 出库作业流水集合
*/
public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow);
/**
* 新增出库做业务流水
*
* @param viewOutJobFlow 出库做业务流水
* 新增出库作业流水
*
* @param viewOutJobFlow 出库作业流水
* @return 结果
*/
public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
/**
* 修改出库做业务流水
*
* @param viewOutJobFlow 出库做业务流水
* 修改出库作业流水
*
* @param viewOutJobFlow 出库作业流水
* @return 结果
*/
public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
/**
* 删除出库做业务流水
*
* @param jobId 出库做业务流水主键
* 删除出库作业流水
*
* @param jobId 出库作业流水主键
* @return 结果
*/
public int deleteViewOutJobFlowByJobId(String jobId);
/**
* 批量删除出库做业务流水
*
* 批量删除出库作业流水
*
* @param jobIds 需要删除的数据主键集合
* @return 结果
*/

51
ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java
View File

@@ -1,61 +1,60 @@
package com.ruoyi.search.ViewOutJobFlow.service;
import java.util.List;
import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
import java.util.List;
/**
* 出库做业务流水Service接口
*
* 出库作业流水Service接口
*
* @author gw
* @date 2025-05-29
* @date 2025-09-22
*/
public interface IViewOutJobFlowService
public interface IViewOutJobFlowService
{
/**
* 查询出库做业务流水
*
* @param jobId 出库做业务流水主键
* @return 出库做业务流水
* 查询出库作业流水
*
* @param jobId 出库作业流水主键
* @return 出库作业流水
*/
public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId);
/**
* 查询出库做业务流水列表
*
* @param viewOutJobFlow 出库做业务流水
* @return 出库做业务流水集合
* 查询出库作业流水列表
*
* @param viewOutJobFlow 出库作业流水
* @return 出库作业流水集合
*/
public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow);
/**
* 新增出库做业务流水
*
* @param viewOutJobFlow 出库做业务流水
* 新增出库作业流水
*
* @param viewOutJobFlow 出库作业流水
* @return 结果
*/
public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
/**
* 修改出库做业务流水
*
* @param viewOutJobFlow 出库做业务流水
* 修改出库作业流水
*
* @param viewOutJobFlow 出库作业流水
* @return 结果
*/
public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
/**
* 批量删除出库做业务流水
*
* @param jobIds 需要删除的出库做业务流水主键集合
* 批量删除出库作业流水
*
* @param jobIds 需要删除的出库作业流水主键集合
* @return 结果
*/
public int deleteViewOutJobFlowByJobIds(String[] jobIds);
/**
* 删除出库做业务流水信息
*
* @param jobId 出库做业务流水主键
* 删除出库作业流水信息
*
* @param jobId 出库作业流水主键
* @return 结果
*/
public int deleteViewOutJobFlowByJobId(String jobId);

59
ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java
View File

@@ -1,32 +1,30 @@
package com.ruoyi.search.ViewOutJobFlow.service.impl;
import com.ruoyi.common.annotation.DataScope;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
import com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper;
import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper;
import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService;
/**
* 出库做业务流水Service业务层处理
*
* 出库作业流水Service业务层处理
*
* @author gw
* @date 2025-05-29
* @date 2025-09-22
*/
@Service
public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
{
@Autowired
private ViewOutJobFlowMapper viewOutJobFlowMapper;
/**
* 查询出库做业务流水
*
* @param jobId 出库做业务流水主键
* @return 出库做业务流水
* 查询出库作业流水
*
* @param jobId 出库作业流水主键
* @return 出库作业流水
*/
@Override
public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId)
@@ -35,22 +33,21 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
}
/**
* 查询出库做业务流水列表
*
* @param viewOutJobFlow 出库做业务流水
* @return 出库做业务流水
* 查询出库作业流水列表
*
* @param viewOutJobFlow 出库作业流水
* @return 出库作业流水
*/
@Override
@DataScope(warehouseAlias = "vojf")
public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow)
{
return viewOutJobFlowMapper.selectViewOutJobFlowList(viewOutJobFlow);
}
/**
* 新增出库做业务流水
*
* @param viewOutJobFlow 出库做业务流水
* 新增出库作业流水
*
* @param viewOutJobFlow 出库作业流水
* @return 结果
*/
@Override
@@ -61,9 +58,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
}
/**
* 修改出库做业务流水
*
* @param viewOutJobFlow 出库做业务流水
* 修改出库作业流水
*
* @param viewOutJobFlow 出库作业流水
* @return 结果
*/
@Override
@@ -73,9 +70,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
}
/**
* 批量删除出库做业务流水
*
* @param jobIds 需要删除的出库做业务流水主键
* 批量删除出库作业流水
*
* @param jobIds 需要删除的出库作业流水主键
* @return 结果
*/
@Override
@@ -85,9 +82,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
}
/**
* 删除出库做业务流水信息
*
* @param jobId 出库做业务流水主键
* 删除出库作业流水信息
*
* @param jobId 出库作业流水主键
* @return 结果
*/
@Override

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

@@ -13,119 +13,268 @@ public class ViewStockDetail extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
// @Excel(name = "${search.ViewStockDetail.onlyIdentity}")
/** 序号 */
@Excel(name = "序号")
private Long onlyIdentity;
/** 库存ID */
@Excel(name = "${search.ViewStockDetail.stockId}")
@Excel(name = "库存ID")
private String stockId;
/** 货位ID */
@Excel(name = "${search.ViewStockDetail.cargoSpaceId}")
@Excel(name = "货位ID")
private String cargoSpaceId;
/** 托盘条码 */
@Excel(name = "${search.ViewStockDetail.trayCode}")
@Excel(name = "托盘条码")
private String trayCode;
/** 数量 */
@Excel(name = "${search.ViewStockDetail.quantity}")
@Excel(name = "数量")
private String quantity;
/** 作业ID */
@Excel(name = "${search.ViewStockDetail.jobId}")
@Excel(name = "作业ID")
private String jobId;
/** 批号 */
// @Excel(name = "${search.ViewStockDetail.lotNo}")
@Excel(name = "批号")
private String lotNo;
/** 入库子单ID */
@Excel(name = "${search.ViewStockDetail.stockinDetailId}")
@Excel(name = "入库子单ID")
private String stockinDetailId;
/** 入库时间 */
@Excel(name = "${search.ViewStockDetail.inDate}")
@Excel(name = "入库时间")
private String inDate;
/** 仓库ID */
@Excel(name = "仓库ID")
private String warehouseId;
/** 仓库 */
@Excel(name = "${search.ViewStockDetail.warehouseId}")
/** 仓库名称 */
@Excel(name = "仓库名称")
private String warehouseName;
/** 剁型ID */
// @Excel(name = "${search.ViewStockDetail.stackingId}")
/** 垛型ID */
@Excel(name = "垛型ID")
private String stackingId;
/** 货位名称 */
@Excel(name = "${search.ViewStockDetail.cargoSpaceName}")
@Excel(name = "货位名称")
private String cargoSpaceName;
/** 巷道ID */
@Excel(name = "${search.ViewStockDetail.roadwayId}")
@Excel(name = "巷道ID")
private String roadwayId;
/** 货位状态 */
@Excel(name = "${search.ViewStockDetail.cargoSpaceStatus}",dictType = "cargo_space_status")
/** 货位状态 1空2满 3入库分配 4出库分配 5入库盘点 6出库盘点 */
@Excel(name = "货位状态", dictType = "cargo_space_status")
private String cargoSpaceStatus;
@Excel(name = "${search.ViewStockDetail.stockStatus}",dictType = "stock_status")
/** 库存状态 1正常 2冻结 */
@Excel(name = "库存状态", dictType = "stock_status")
private String stockStatus;
@Excel(name = "${search.ViewStockDetail.productStatus}",dictType = "product_status")
/** 物料状态 1正常 2盘点待审批 3异常 */
@Excel(name = "物料状态", dictType = "product_status")
private String productStatus;
/** 是否锁定 */
@Excel(name = "${search.ViewStockDetail.locked}",dictType = "cargo_space_lock_status")
/** 是否锁定 Y锁、N开 */
@Excel(name = "是否锁定", dictType = "cargo_space_lock_status")
private String locked;
/** 物料ID */
@Excel(name = "${search.ViewStockDetail.productId}")
/** 物料GUID */
@Excel(name = "物料GUID")
private String productGuid;
/** 物料编码 */
@Excel(name = "物料编码")
private String productId;
/** 物料名称 */
@Excel(name = "${search.ViewStockDetail.productName}")
@Excel(name = "物料名称")
private String productName;
/** 规格 */
// @Excel(name = "${search.ViewStockDetail.spec}")
@Excel(name = "规格")
private String spec;
/** 单位 */
@Excel(name = "${search.ViewStockDetail.unit}")
@Excel(name = "单位")
private String unit;
/** 价格 */
// @Excel(name = "${search.ViewStockDetail.price}")
@Excel(name = "价格")
private String price;
/** 产品分类 */
@Excel(name = "产品分类")
private String parentId;
/** 品号描述 */
@Excel(name = "品号描述")
private String cargoNo;
/** 英文名称 */
@Excel(name = "${search.ViewStockDetail.spare1}")
@Excel(name = "英文名称")
private String spare1;
/** 单件净重 */
@Excel(name = "${search.ViewStockDetail.spare2}")
@Excel(name = "单件净重")
private String spare2;
/** 长MM */
@Excel(name = "${search.ViewStockDetail.spare5}")
/** 颜色 */
@Excel(name = "颜色")
private String spare3;
/** 序列号 */
@Excel(name = "序列号")
private String spare4;
/** 电压 */
@Excel(name = "电压")
private String spare5;
/** 宽MM */
@Excel(name = "${search.ViewStockDetail.spare6}")
/** 功率 */
@Excel(name = "功率")
private String spare6;
/** 高MM */
@Excel(name = "${search.ViewStockDetail.spare7}")
/** 相位 */
@Excel(name = "相位")
private String spare7;
/** 体积m³ */
@Excel(name = "${search.ViewStockDetail.spare8}")
/** 毛重 */
@Excel(name = "毛重")
private String spare8;
/** NC号 */
@Excel(name = "NC号")
private String spare9;
/** 电源线 */
@Excel(name = "电源线")
private String spare10;
/** 插头 */
@Excel(name = "插头")
private String spare11;
/** 接嘴 */
@Excel(name = "接嘴")
private String spare12;
/** 快捷码 */
@Excel(name = "快捷码")
private String spare13;
/** 库存单位编号 */
@Excel(name = "库存单位编号")
private String spare14;
/** 库存单位名称 */
@Excel(name = "库存单位名称")
private String spare15;
/** 品号群组 */
@Excel(name = "品号群组")
private String spare16;
/** 归类品 */
@Excel(name = "归类品")
private String spare17;
/** 计量体系 */
@Excel(name = "计量体系")
private String spare18;
/** 群组名称 */
@Excel(name = "群组名称")
private String spare19;
/** 批号管理 */
@Excel(name = "批号管理")
private String spare20;
/** 状态 */
@Excel(name = "状态")
private String spare21;
/** 产品大类 */
@Excel(name = "产品大类")
private String spare22;
/** 产品二类 */
@Excel(name = "产品二类")
private String spare23;
/** 产品线/产品系列 */
@Excel(name = "产品线/产品系列")
private String spare24;
/** BOM状态 */
@Excel(name = "BOM状态")
private String spare25;
/** 产品定位 */
@Excel(name = "产品定位")
private String spare26;
/** 电脑板型号 */
@Excel(name = "电脑板型号")
private String spare27;
/** 非标要求 */
@Excel(name = "非标要求")
private String spare28;
/** 品牌 */
@Excel(name = "品牌")
private String spare29;
/** 非标颜色 */
@Excel(name = "非标颜色")
private String spare30;
/** 主颜色 */
@Excel(name = "主颜色")
private String spare31;
/** 辅助颜色 */
@Excel(name = "辅助颜色")
private String spare32;
/** 是否标准款 */
@Excel(name = "是否标准款")
private String spare33;
/** 包装方式 */
@Excel(name = "包装方式")
private String spare34;
/** 主要包装方式 */
@Excel(name = "主要包装方式")
private String spare35;
/** 长 */
@Excel(name = "长")
private String spare36;
/** 宽 */
@Excel(name = "宽")
private String spare37;
/** 高 */
@Excel(name = "高")
private String spare38;
/** 包装材积 */
@Excel(name = "包装材积")
private String spare39;
/** 备注 */
@Excel(name = "${search.ViewStockDetail.remark}")
@Excel(name = "描述")
private String remark;
@@ -412,6 +561,366 @@ public class ViewStockDetail extends BaseEntity
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{" +
@@ -425,22 +934,61 @@ public class ViewStockDetail extends BaseEntity
", 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 + '\'' +
'}';
}

28
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java
View File

@@ -1,25 +1,31 @@
package com.ruoyi.search.ViewStockSecure.controller;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
import com.ruoyi.search.ViewStockSecure.service.IViewStockSecureService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 安全库存查询Controller
*
* @author ruoyi
* @date 2025-08-06
*
* @author gw
* @date 2025-09-22
*/
@RestController
@RequestMapping("/search/ViewStockSecure")

1153
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java
View File

File diff suppressed because it is too large Load Diff

23
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java
View File

@@ -1,20 +1,19 @@
package com.ruoyi.search.ViewStockSecure.mapper;
import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
import java.util.List;
import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
/**
* 安全库存查询Mapper接口
*
* @author ruoyi
* @date 2025-08-06
*
* @author gw
* @date 2025-09-22
*/
public interface ViewStockSecureMapper
public interface ViewStockSecureMapper
{
/**
* 查询安全库存查询
*
*
* @param stockId 安全库存查询主键
* @return 安全库存查询
*/
@@ -22,7 +21,7 @@ public interface ViewStockSecureMapper
/**
* 查询安全库存查询列表
*
*
* @param viewStockSecure 安全库存查询
* @return 安全库存查询集合
*/
@@ -30,7 +29,7 @@ public interface ViewStockSecureMapper
/**
* 新增安全库存查询
*
*
* @param viewStockSecure 安全库存查询
* @return 结果
*/
@@ -38,7 +37,7 @@ public interface ViewStockSecureMapper
/**
* 修改安全库存查询
*
*
* @param viewStockSecure 安全库存查询
* @return 结果
*/
@@ -46,7 +45,7 @@ public interface ViewStockSecureMapper
/**
* 删除安全库存查询
*
*
* @param stockId 安全库存查询主键
* @return 结果
*/
@@ -54,7 +53,7 @@ public interface ViewStockSecureMapper
/**
* 批量删除安全库存查询
*
*
* @param stockIds 需要删除的数据主键集合
* @return 结果
*/

23
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java
View File

@@ -1,20 +1,19 @@
package com.ruoyi.search.ViewStockSecure.service;
import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
import java.util.List;
import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
/**
* 安全库存查询Service接口
*
* @author ruoyi
* @date 2025-08-06
*
* @author gw
* @date 2025-09-22
*/
public interface IViewStockSecureService
public interface IViewStockSecureService
{
/**
* 查询安全库存查询
*
*
* @param stockId 安全库存查询主键
* @return 安全库存查询
*/
@@ -22,7 +21,7 @@ public interface IViewStockSecureService
/**
* 查询安全库存查询列表
*
*
* @param viewStockSecure 安全库存查询
* @return 安全库存查询集合
*/
@@ -30,7 +29,7 @@ public interface IViewStockSecureService
/**
* 新增安全库存查询
*
*
* @param viewStockSecure 安全库存查询
* @return 结果
*/
@@ -38,7 +37,7 @@ public interface IViewStockSecureService
/**
* 修改安全库存查询
*
*
* @param viewStockSecure 安全库存查询
* @return 结果
*/
@@ -46,7 +45,7 @@ public interface IViewStockSecureService
/**
* 批量删除安全库存查询
*
*
* @param stockIds 需要删除的安全库存查询主键集合
* @return 结果
*/
@@ -54,7 +53,7 @@ public interface IViewStockSecureService
/**
* 删除安全库存查询信息
*
*
* @param stockId 安全库存查询主键
* @return 结果
*/

29
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java
View File

@@ -1,28 +1,27 @@
package com.ruoyi.search.ViewStockSecure.service.impl;
import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
import com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper;
import com.ruoyi.search.ViewStockSecure.service.IViewStockSecureService;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper;
import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
import com.ruoyi.search.ViewStockSecure.service.IViewStockSecureService;
/**
* 安全库存查询Service业务层处理
*
* @author ruoyi
* @date 2025-08-06
*
* @author gw
* @date 2025-09-22
*/
@Service
public class ViewStockSecureServiceImpl implements IViewStockSecureService
public class ViewStockSecureServiceImpl implements IViewStockSecureService
{
@Autowired
private ViewStockSecureMapper viewStockSecureMapper;
/**
* 查询安全库存查询
*
*
* @param stockId 安全库存查询主键
* @return 安全库存查询
*/
@@ -34,7 +33,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
/**
* 查询安全库存查询列表
*
*
* @param viewStockSecure 安全库存查询
* @return 安全库存查询
*/
@@ -46,7 +45,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
/**
* 新增安全库存查询
*
*
* @param viewStockSecure 安全库存查询
* @return 结果
*/
@@ -58,7 +57,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
/**
* 修改安全库存查询
*
*
* @param viewStockSecure 安全库存查询
* @return 结果
*/
@@ -70,7 +69,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
/**
* 批量删除安全库存查询
*
*
* @param stockIds 需要删除的安全库存查询主键
* @return 结果
*/
@@ -82,7 +81,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
/**
* 删除安全库存查询信息
*
*
* @param stockId 安全库存查询主键
* @return 结果
*/

52
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java
View File

@@ -1,25 +1,31 @@
package com.ruoyi.search.ViewStockWarning.controller;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;
import com.ruoyi.search.ViewStockWarning.service.IViewStockWarningService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 库存预警报表Controller
*
* @author ruoyi
* @date 2025-08-06
* 库存预警查询Controller
*
* @author gw
* @date 2025-09-22
*/
@RestController
@RequestMapping("/search/ViewStockWarning")
@@ -29,7 +35,7 @@ public class ViewStockWarningController extends BaseController
private IViewStockWarningService viewStockWarningService;
/**
* 查询库存预警报表列表
* 查询库存预警查询列表
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockWarning:list')")
@GetMapping("/list")
@@ -41,20 +47,20 @@ public class ViewStockWarningController extends BaseController
}
/**
* 导出库存预警报表列表
* 导出库存预警查询列表
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockWarning:export')")
@Log(title = "库存预警报表", businessType = BusinessType.EXPORT)
@Log(title = "库存预警查询", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ViewStockWarning viewStockWarning)
{
List<ViewStockWarning> list = viewStockWarningService.selectViewStockWarningList(viewStockWarning);
ExcelUtil<ViewStockWarning> util = new ExcelUtil<ViewStockWarning>(ViewStockWarning.class);
util.exportExcel(response, list, "库存预警报表数据");
util.exportExcel(response, list, "库存预警查询数据");
}
/**
* 获取库存预警报表详细信息
* 获取库存预警查询详细信息
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockWarning:query')")
@GetMapping(value = "/{stockId}")
@@ -64,10 +70,10 @@ public class ViewStockWarningController extends BaseController
}
/**
* 新增库存预警报表
* 新增库存预警查询
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockWarning:add')")
@Log(title = "库存预警报表", businessType = BusinessType.INSERT)
@Log(title = "库存预警查询", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ViewStockWarning viewStockWarning)
{
@@ -75,10 +81,10 @@ public class ViewStockWarningController extends BaseController
}
/**
* 修改库存预警报表
* 修改库存预警查询
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockWarning:edit')")
@Log(title = "库存预警报表", businessType = BusinessType.UPDATE)
@Log(title = "库存预警查询", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ViewStockWarning viewStockWarning)
{
@@ -86,10 +92,10 @@ public class ViewStockWarningController extends BaseController
}
/**
* 删除库存预警报表
* 删除库存预警查询
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockWarning:remove')")
@Log(title = "库存预警报表", businessType = BusinessType.DELETE)
@Log(title = "库存预警查询", businessType = BusinessType.DELETE)
@DeleteMapping("/{stockIds}")
public AjaxResult remove(@PathVariable String[] stockIds)
{

1070
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java
View File

File diff suppressed because it is too large Load Diff

51
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java
View File

@@ -1,60 +1,59 @@
package com.ruoyi.search.ViewStockWarning.mapper;
import java.util.List;
import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;
import java.util.List;
/**
* 库存预警报表Mapper接口
*
* @author ruoyi
* @date 2025-08-06
* 库存预警查询Mapper接口
*
* @author gw
* @date 2025-09-22
*/
public interface ViewStockWarningMapper
public interface ViewStockWarningMapper
{
/**
* 查询库存预警报表
*
* @param stockId 库存预警报表主键
* @return 库存预警报表
* 查询库存预警查询
*
* @param stockId 库存预警查询主键
* @return 库存预警查询
*/
public ViewStockWarning selectViewStockWarningByStockId(String stockId);
/**
* 查询库存预警报表列表
*
* @param viewStockWarning 库存预警报表
* @return 库存预警报表集合
* 查询库存预警查询列表
*
* @param viewStockWarning 库存预警查询
* @return 库存预警查询集合
*/
public List<ViewStockWarning> selectViewStockWarningList(ViewStockWarning viewStockWarning);
/**
* 新增库存预警报表
*
* @param viewStockWarning 库存预警报表
* 新增库存预警查询
*
* @param viewStockWarning 库存预警查询
* @return 结果
*/
public int insertViewStockWarning(ViewStockWarning viewStockWarning);
/**
* 修改库存预警报表
*
* @param viewStockWarning 库存预警报表
* 修改库存预警查询
*
* @param viewStockWarning 库存预警查询
* @return 结果
*/
public int updateViewStockWarning(ViewStockWarning viewStockWarning);
/**
* 删除库存预警报表
*
* @param stockId 库存预警报表主键
* 删除库存预警查询
*
* @param stockId 库存预警查询主键
* @return 结果
*/
public int deleteViewStockWarningByStockId(String stockId);
/**
* 批量删除库存预警报表
*
* 批量删除库存预警查询
*
* @param stockIds 需要删除的数据主键集合
* @return 结果
*/

53
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java
View File

@@ -1,61 +1,60 @@
package com.ruoyi.search.ViewStockWarning.service;
import java.util.List;
import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;
import java.util.List;
/**
* 库存预警报表Service接口
*
* @author ruoyi
* @date 2025-08-06
* 库存预警查询Service接口
*
* @author gw
* @date 2025-09-22
*/
public interface IViewStockWarningService
public interface IViewStockWarningService
{
/**
* 查询库存预警报表
*
* @param stockId 库存预警报表主键
* @return 库存预警报表
* 查询库存预警查询
*
* @param stockId 库存预警查询主键
* @return 库存预警查询
*/
public ViewStockWarning selectViewStockWarningByStockId(String stockId);
/**
* 查询库存预警报表列表
*
* @param viewStockWarning 库存预警报表
* @return 库存预警报表集合
* 查询库存预警查询列表
*
* @param viewStockWarning 库存预警查询
* @return 库存预警查询集合
*/
public List<ViewStockWarning> selectViewStockWarningList(ViewStockWarning viewStockWarning);
/**
* 新增库存预警报表
*
* @param viewStockWarning 库存预警报表
* 新增库存预警查询
*
* @param viewStockWarning 库存预警查询
* @return 结果
*/
public int insertViewStockWarning(ViewStockWarning viewStockWarning);
/**
* 修改库存预警报表
*
* @param viewStockWarning 库存预警报表
* 修改库存预警查询
*
* @param viewStockWarning 库存预警查询
* @return 结果
*/
public int updateViewStockWarning(ViewStockWarning viewStockWarning);
/**
* 批量删除库存预警报表
*
* @param stockIds 需要删除的库存预警报表主键集合
* 批量删除库存预警查询
*
* @param stockIds 需要删除的库存预警查询主键集合
* @return 结果
*/
public int deleteViewStockWarningByStockIds(String[] stockIds);
/**
* 删除库存预警报表信息
*
* @param stockId 库存预警报表主键
* 删除库存预警查询信息
*
* @param stockId 库存预警查询主键
* @return 结果
*/
public int deleteViewStockWarningByStockId(String stockId);

59
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java
View File

@@ -1,30 +1,29 @@
package com.ruoyi.search.ViewStockWarning.service.impl;
import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;
import com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper;
import com.ruoyi.search.ViewStockWarning.service.IViewStockWarningService;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper;
import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;
import com.ruoyi.search.ViewStockWarning.service.IViewStockWarningService;
/**
* 库存预警报表Service业务层处理
*
* @author ruoyi
* @date 2025-08-06
* 库存预警查询Service业务层处理
*
* @author gw
* @date 2025-09-22
*/
@Service
public class ViewStockWarningServiceImpl implements IViewStockWarningService
public class ViewStockWarningServiceImpl implements IViewStockWarningService
{
@Autowired
private ViewStockWarningMapper viewStockWarningMapper;
/**
* 查询库存预警报表
*
* @param stockId 库存预警报表主键
* @return 库存预警报表
* 查询库存预警查询
*
* @param stockId 库存预警查询主键
* @return 库存预警查询
*/
@Override
public ViewStockWarning selectViewStockWarningByStockId(String stockId)
@@ -33,10 +32,10 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
}
/**
* 查询库存预警报表列表
*
* @param viewStockWarning 库存预警报表
* @return 库存预警报表
* 查询库存预警查询列表
*
* @param viewStockWarning 库存预警查询
* @return 库存预警查询
*/
@Override
public List<ViewStockWarning> selectViewStockWarningList(ViewStockWarning viewStockWarning)
@@ -45,9 +44,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
}
/**
* 新增库存预警报表
*
* @param viewStockWarning 库存预警报表
* 新增库存预警查询
*
* @param viewStockWarning 库存预警查询
* @return 结果
*/
@Override
@@ -57,9 +56,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
}
/**
* 修改库存预警报表
*
* @param viewStockWarning 库存预警报表
* 修改库存预警查询
*
* @param viewStockWarning 库存预警查询
* @return 结果
*/
@Override
@@ -69,9 +68,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
}
/**
* 批量删除库存预警报表
*
* @param stockIds 需要删除的库存预警报表主键
* 批量删除库存预警查询
*
* @param stockIds 需要删除的库存预警查询主键
* @return 结果
*/
@Override
@@ -81,9 +80,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
}
/**
* 删除库存预警报表信息
*
* @param stockId 库存预警报表主键
* 删除库存预警查询信息
*
* @param stockId 库存预警查询主键
* @return 结果
*/
@Override

26
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/controller/ViewStockinHistoryController.java
View File

@@ -1,25 +1,31 @@
package com.ruoyi.search.ViewStockinHistory.controller;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 入库单据历史Controller
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-19
*/
@RestController
@RequestMapping("/search/ViewStockinHistory")

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

File diff suppressed because it is too large Load Diff

21
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/mapper/ViewStockinHistoryMapper.java
View File

@@ -1,20 +1,19 @@
package com.ruoyi.search.ViewStockinHistory.mapper;
import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
import java.util.List;
import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
/**
* 入库单据历史Mapper接口
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-19
*/
public interface ViewStockinHistoryMapper
public interface ViewStockinHistoryMapper
{
/**
* 查询入库单据历史
*
*
* @param stockinGuid 入库单据历史主键
* @return 入库单据历史
*/
@@ -22,7 +21,7 @@ public interface ViewStockinHistoryMapper
/**
* 查询入库单据历史列表
*
*
* @param viewStockinHistory 入库单据历史
* @return 入库单据历史集合
*/
@@ -30,7 +29,7 @@ public interface ViewStockinHistoryMapper
/**
* 新增入库单据历史
*
*
* @param viewStockinHistory 入库单据历史
* @return 结果
*/
@@ -38,7 +37,7 @@ public interface ViewStockinHistoryMapper
/**
* 修改入库单据历史
*
*
* @param viewStockinHistory 入库单据历史
* @return 结果
*/
@@ -46,7 +45,7 @@ public interface ViewStockinHistoryMapper
/**
* 删除入库单据历史
*
*
* @param stockinGuid 入库单据历史主键
* @return 结果
*/
@@ -54,7 +53,7 @@ public interface ViewStockinHistoryMapper
/**
* 批量删除入库单据历史
*
*
* @param stockinGuids 需要删除的数据主键集合
* @return 结果
*/

21
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/IViewStockinHistoryService.java
View File

@@ -1,20 +1,19 @@
package com.ruoyi.search.ViewStockinHistory.service;
import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
import java.util.List;
import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
/**
* 入库单据历史Service接口
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-19
*/
public interface IViewStockinHistoryService
public interface IViewStockinHistoryService
{
/**
* 查询入库单据历史
*
*
* @param stockinGuid 入库单据历史主键
* @return 入库单据历史
*/
@@ -22,7 +21,7 @@ public interface IViewStockinHistoryService
/**
* 查询入库单据历史列表
*
*
* @param viewStockinHistory 入库单据历史
* @return 入库单据历史集合
*/
@@ -30,7 +29,7 @@ public interface IViewStockinHistoryService
/**
* 新增入库单据历史
*
*
* @param viewStockinHistory 入库单据历史
* @return 结果
*/
@@ -38,7 +37,7 @@ public interface IViewStockinHistoryService
/**
* 修改入库单据历史
*
*
* @param viewStockinHistory 入库单据历史
* @return 结果
*/
@@ -46,7 +45,7 @@ public interface IViewStockinHistoryService
/**
* 批量删除入库单据历史
*
*
* @param stockinGuids 需要删除的入库单据历史主键集合
* @return 结果
*/
@@ -54,7 +53,7 @@ public interface IViewStockinHistoryService
/**
* 删除入库单据历史信息
*
*
* @param stockinGuid 入库单据历史主键
* @return 结果
*/

29
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/impl/ViewStockinHistoryServiceImpl.java
View File

@@ -1,29 +1,27 @@
package com.ruoyi.search.ViewStockinHistory.service.impl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
import com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper;
import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper;
import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService;
/**
* 入库单据历史Service业务层处理
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-19
*/
@Service
public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
{
@Autowired
private ViewStockinHistoryMapper viewStockinHistoryMapper;
/**
* 查询入库单据历史
*
*
* @param stockinGuid 入库单据历史主键
* @return 入库单据历史
*/
@@ -35,12 +33,11 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
/**
* 查询入库单据历史列表
*
*
* @param viewStockinHistory 入库单据历史
* @return 入库单据历史
*/
@Override
@DataScope(warehouseAlias = "vsh")
public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory)
{
return viewStockinHistoryMapper.selectViewStockinHistoryList(viewStockinHistory);
@@ -48,7 +45,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
/**
* 新增入库单据历史
*
*
* @param viewStockinHistory 入库单据历史
* @return 结果
*/
@@ -60,7 +57,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
/**
* 修改入库单据历史
*
*
* @param viewStockinHistory 入库单据历史
* @return 结果
*/
@@ -72,7 +69,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
/**
* 批量删除入库单据历史
*
*
* @param stockinGuids 需要删除的入库单据历史主键
* @return 结果
*/
@@ -84,7 +81,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
/**
* 删除入库单据历史信息
*
*
* @param stockinGuid 入库单据历史主键
* @return 结果
*/

26
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/controller/ViewStockoutHistoryController.java
View File

@@ -1,25 +1,31 @@
package com.ruoyi.search.ViewStockoutHistory.controller;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 出库单据历史Controller
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-19
*/
@RestController
@RequestMapping("/search/ViewStockoutHistory")

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

File diff suppressed because it is too large Load Diff

21
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/mapper/ViewStockoutHistoryMapper.java
View File

@@ -1,20 +1,19 @@
package com.ruoyi.search.ViewStockoutHistory.mapper;
import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
import java.util.List;
import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
/**
* 出库单据历史Mapper接口
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-19
*/
public interface ViewStockoutHistoryMapper
public interface ViewStockoutHistoryMapper
{
/**
* 查询出库单据历史
*
*
* @param stockoutId 出库单据历史主键
* @return 出库单据历史
*/
@@ -22,7 +21,7 @@ public interface ViewStockoutHistoryMapper
/**
* 查询出库单据历史列表
*
*
* @param viewStockoutHistory 出库单据历史
* @return 出库单据历史集合
*/
@@ -30,7 +29,7 @@ public interface ViewStockoutHistoryMapper
/**
* 新增出库单据历史
*
*
* @param viewStockoutHistory 出库单据历史
* @return 结果
*/
@@ -38,7 +37,7 @@ public interface ViewStockoutHistoryMapper
/**
* 修改出库单据历史
*
*
* @param viewStockoutHistory 出库单据历史
* @return 结果
*/
@@ -46,7 +45,7 @@ public interface ViewStockoutHistoryMapper
/**
* 删除出库单据历史
*
*
* @param stockoutId 出库单据历史主键
* @return 结果
*/
@@ -54,7 +53,7 @@ public interface ViewStockoutHistoryMapper
/**
* 批量删除出库单据历史
*
*
* @param stockoutIds 需要删除的数据主键集合
* @return 结果
*/

21
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java
View File

@@ -1,20 +1,19 @@
package com.ruoyi.search.ViewStockoutHistory.service;
import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
import java.util.List;
import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
/**
* 出库单据历史Service接口
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-19
*/
public interface IViewStockoutHistoryService
public interface IViewStockoutHistoryService
{
/**
* 查询出库单据历史
*
*
* @param stockoutId 出库单据历史主键
* @return 出库单据历史
*/
@@ -22,7 +21,7 @@ public interface IViewStockoutHistoryService
/**
* 查询出库单据历史列表
*
*
* @param viewStockoutHistory 出库单据历史
* @return 出库单据历史集合
*/
@@ -30,7 +29,7 @@ public interface IViewStockoutHistoryService
/**
* 新增出库单据历史
*
*
* @param viewStockoutHistory 出库单据历史
* @return 结果
*/
@@ -38,7 +37,7 @@ public interface IViewStockoutHistoryService
/**
* 修改出库单据历史
*
*
* @param viewStockoutHistory 出库单据历史
* @return 结果
*/
@@ -46,7 +45,7 @@ public interface IViewStockoutHistoryService
/**
* 批量删除出库单据历史
*
*
* @param stockoutIds 需要删除的出库单据历史主键集合
* @return 结果
*/
@@ -54,7 +53,7 @@ public interface IViewStockoutHistoryService
/**
* 删除出库单据历史信息
*
*
* @param stockoutId 出库单据历史主键
* @return 结果
*/

29
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java
View File

@@ -1,29 +1,27 @@
package com.ruoyi.search.ViewStockoutHistory.service.impl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
import com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper;
import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper;
import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService;
/**
* 出库单据历史Service业务层处理
*
*
* @author gw
* @date 2025-05-28
* @date 2025-09-19
*/
@Service
public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryService
public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryService
{
@Autowired
private ViewStockoutHistoryMapper viewStockoutHistoryMapper;
/**
* 查询出库单据历史
*
*
* @param stockoutId 出库单据历史主键
* @return 出库单据历史
*/
@@ -35,12 +33,11 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
/**
* 查询出库单据历史列表
*
*
* @param viewStockoutHistory 出库单据历史
* @return 出库单据历史
*/
@Override
@DataScope(warehouseAlias = "vsh")
public List<ViewStockoutHistory> selectViewStockoutHistoryList(ViewStockoutHistory viewStockoutHistory)
{
return viewStockoutHistoryMapper.selectViewStockoutHistoryList(viewStockoutHistory);
@@ -48,7 +45,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
/**
* 新增出库单据历史
*
*
* @param viewStockoutHistory 出库单据历史
* @return 结果
*/
@@ -60,7 +57,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
/**
* 修改出库单据历史
*
*
* @param viewStockoutHistory 出库单据历史
* @return 结果
*/
@@ -72,7 +69,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
/**
* 批量删除出库单据历史
*
*
* @param stockoutIds 需要删除的出库单据历史主键
* @return 结果
*/
@@ -84,7 +81,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
/**
* 删除出库单据历史信息
*
*
* @param stockoutId 出库单据历史主键
* @return 结果
*/

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

@@ -15,12 +15,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseName" column="warehouse_name" />
<result property="quantity" column="quantity" />
<result property="price" column="price" />
<result property="roadwayId" column="roadway_id" />
<result property="parentId" column="parent_id" />
<result property="cargoNo" column="cargo_no" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="spare10" column="spare10" />
<result property="spare11" column="spare11" />
<result property="spare12" column="spare12" />
<result property="spare13" column="spare13" />
<result property="spare14" column="spare14" />
<result property="spare15" column="spare15" />
<result property="spare16" column="spare16" />
<result property="spare17" column="spare17" />
<result property="spare18" column="spare18" />
<result property="spare19" column="spare19" />
<result property="spare20" column="spare20" />
<result property="spare21" column="spare21" />
<result property="spare22" column="spare22" />
<result property="spare23" column="spare23" />
<result property="spare24" column="spare24" />
<result property="spare25" column="spare25" />
<result property="spare26" column="spare26" />
<result property="spare27" column="spare27" />
<result property="spare28" column="spare28" />
<result property="spare29" column="spare29" />
<result property="spare30" column="spare30" />
<result property="spare31" column="spare31" />
<result property="spare32" column="spare32" />
<result property="spare33" column="spare33" />
<result property="spare34" column="spare34" />
<result property="spare35" column="spare35" />
<result property="spare36" column="spare36" />
<result property="spare37" column="spare37" />
<result property="spare38" column="spare38" />
<result property="spare39" column="spare39" />
<result property="remark" column="remark" />
<result property="cargoSpaceId" column="cargo_space_id" />
<result property="cargoSpaceName" column="cargo_space_name" />
@@ -29,23 +65,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectStockSummaryVo">
SELECT
<choose>
<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 groupByRoadwayId != null and groupByRoadwayId or groupByPrice != null and groupByPrice or groupBySpare1 != null and groupBySpare1 or groupBySpare2 != null and groupBySpare2 or groupBySpare5 != null and groupBySpare5 or groupBySpare6 != null and groupBySpare6 or groupBySpare7 != null and groupBySpare7 or groupBySpare8 != null and groupBySpare8">
<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="groupByPrice != null and groupByPrice">p.price,</if>
<if test="groupBySpare1 != null and groupBySpare1">p.spare1,</if>
<if test="groupBySpare2 != null and groupBySpare2">p.spare2,</if>
<if test="groupBySpare5 != null and groupBySpare5">p.spare5,</if>
<if test="groupBySpare6 != null and groupBySpare6">p.spare6,</if>
<if test="groupBySpare8 != null and groupBySpare8">p.spare8,</if>
<if test="groupBySpare7 != null and groupBySpare7">p.spare7,</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>
<if test="groupByParentId != null and groupByParentId">p.parent_id,</if>
<if test="groupByCargoNo != null and groupByCargoNo">p.cargo_no,</if>
<if test="groupBySpare1 != null and groupBySpare1">p.spare1,</if>
<if test="groupBySpare2 != null and groupBySpare2">p.spare2,</if>
<if test="groupBySpare3 != null and groupBySpare3">p.spare3,</if>
<if test="groupBySpare4 != null and groupBySpare4">p.spare4,</if>
<if test="groupBySpare5 != null and groupBySpare5">p.spare5,</if>
<if test="groupBySpare6 != null and groupBySpare6">p.spare6,</if>
<if test="groupBySpare7 != null and groupBySpare7">p.spare7,</if>
<if test="groupBySpare8 != null and groupBySpare8">p.spare8,</if>
<if test="groupBySpare9 != null and groupBySpare9">p.spare9,</if>
<if test="groupBySpare10 != null and groupBySpare10">p.spare10,</if>
<if test="groupByLotNo != null and groupByLotNo">s.lot_no,</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">s.warehouse_id,</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">bw.warehouse_name,</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">s.cargo_space_id,</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">bcs.cargo_space_name,</if>
<if test="groupByRoadwayId != null and groupByRoadwayId">bcs.roadway_id,</if>
SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity
FROM bas_stock s
LEFT JOIN bas_product p ON s.product_id = p.product_id
@@ -67,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null and remark != ''"> AND p.spare7 like concat('%', #{remark}, '%')}</if>
<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('%', #{roadwayId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
@@ -79,17 +122,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="groupByParentId != null and groupByParentId">,p.parent_id</if>
<if test="groupByCargoNo != null and groupByCargoNo">,p.cargo_no</if>
<if test="groupBySpare1 != null and groupBySpare1">,p.spare1</if>
<if test="groupBySpare2 != null and groupBySpare2">,p.spare2</if>
<if test="groupBySpare3 != null and groupBySpare3">,p.spare3</if>
<if test="groupBySpare4 != null and groupBySpare4">,p.spare4</if>
<if test="groupBySpare5 != null and groupBySpare5">,p.spare5</if>
<if test="groupBySpare6 != null and groupBySpare6">,p.spare6</if>
<if test="groupBySpare8 != null and groupBySpare8">,p.spare8</if>
<if test="groupBySpare7 != null and groupBySpare7">,p.spare7</if>
<if test="groupBySpare8 != null and groupBySpare8">,p.spare8</if>
<if test="groupBySpare9 != null and groupBySpare9">,p.spare9</if>
<if test="groupBySpare10 != null and groupBySpare10">,p.spare10</if>
<if test="groupBySpare11 != null and groupBySpare11">,p.spare11</if>
<if test="groupBySpare12 != null and groupBySpare12">,p.spare12</if>
<if test="groupBySpare13 != null and groupBySpare13">,p.spare13</if>
<if test="groupBySpare14 != null and groupBySpare14">,p.spare14</if>
<if test="groupBySpare15 != null and groupBySpare15">,p.spare15</if>
<if test="groupBySpare16 != null and groupBySpare16">,p.spare16</if>
<if test="groupBySpare17 != null and groupBySpare17">,p.spare17</if>
<if test="groupBySpare18 != null and groupBySpare18">,p.spare18</if>
<if test="groupBySpare19 != null and groupBySpare19">,p.spare19</if>
<if test="groupBySpare20 != null and groupBySpare20">,p.spare20</if>
<if test="groupBySpare21 != null and groupBySpare21">,p.spare21</if>
<if test="groupBySpare22 != null and groupBySpare22">,p.spare22</if>
<if test="groupBySpare23 != null and groupBySpare23">,p.spare23</if>
<if test="groupBySpare24 != null and groupBySpare24">,p.spare24</if>
<if test="groupBySpare25 != null and groupBySpare25">,p.spare25</if>
<if test="groupBySpare26 != null and groupBySpare26">,p.spare26</if>
<if test="groupBySpare27 != null and groupBySpare27">,p.spare27</if>
<if test="groupBySpare28 != null and groupBySpare28">,p.spare28</if>
<if test="groupBySpare29 != null and groupBySpare29">,p.spare29</if>
<if test="groupBySpare30 != null and groupBySpare30">,p.spare30</if>
<if test="groupBySpare31 != null and groupBySpare31">,p.spare31</if>
<if test="groupBySpare32 != null and groupBySpare32">,p.spare32</if>
<if test="groupBySpare33 != null and groupBySpare33">,p.spare33</if>
<if test="groupBySpare34 != null and groupBySpare34">,p.spare34</if>
<if test="groupBySpare35 != null and groupBySpare35">,p.spare35</if>
<if test="groupBySpare36 != null and groupBySpare36">,p.spare36</if>
<if test="groupBySpare37 != null and groupBySpare37">,p.spare37</if>
<if test="groupBySpare38 != null and groupBySpare38">,p.spare38</if>
<if test="groupBySpare39 != null and groupBySpare39">,p.spare39</if>
<if test="groupByLotNo != null and groupByLotNo">,s.lot_no</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">,s.warehouse_id</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">,bw.warehouse_name</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">,s.cargo_space_id</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">,bcs.cargo_space_name</if>
<if test="groupByRoadwayId != null and groupByRoadwayId">,bcs.roadway_id</if>
</trim>
</when>
<otherwise>
@@ -104,16 +183,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="parentId != null and parentId != ''"> AND p.parent_id like concat('%', #{parentId}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> AND p.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> AND p.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> AND p.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> AND p.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> AND p.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> AND p.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> AND p.spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare8 != null and spare8 != ''"> AND p.spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare7 != null and spare7 != ''"> AND p.spare7 like concat('%', #{spare7}, '%')</if>
<if test="remark != null and remark != ''"> AND p.spare7 like concat('%', #{remark}, '%')}</if>
<if test="spare8 != null and spare8 != ''"> AND p.spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare9 != null and spare9 != ''"> AND p.spare9 like concat('%', #{spare9}, '%')</if>
<if test="spare10 != null and spare10 != ''"> AND p.spare10 like concat('%', #{spare10}, '%')</if>
<if test="spare11 != null and spare11 != ''"> AND p.spare11 like concat('%', #{spare11}, '%')</if>
<if test="spare12 != null and spare12 != ''"> AND p.spare12 like concat('%', #{spare12}, '%')</if>
<if test="spare13 != null and spare13 != ''"> AND p.spare13 like concat('%', #{spare13}, '%')</if>
<if test="spare14 != null and spare14 != ''"> AND p.spare14 like concat('%', #{spare14}, '%')</if>
<if test="spare15 != null and spare15 != ''"> AND p.spare15 like concat('%', #{spare15}, '%')</if>
<if test="spare16 != null and spare16 != ''"> AND p.spare16 like concat('%', #{spare16}, '%')</if>
<if test="spare17 != null and spare17 != ''"> AND p.spare17 like concat('%', #{spare17}, '%')</if>
<if test="spare18 != null and spare18 != ''"> AND p.spare18 like concat('%', #{spare18}, '%')</if>
<if test="spare19 != null and spare19 != ''"> AND p.spare19 like concat('%', #{spare19}, '%')</if>
<if test="spare20 != null and spare20 != ''"> AND p.spare20 like concat('%', #{spare20}, '%')</if>
<if test="spare21 != null and spare21 != ''"> AND p.spare21 like concat('%', #{spare21}, '%')</if>
<if test="spare22 != null and spare22 != ''"> AND p.spare22 like concat('%', #{spare22}, '%')</if>
<if test="spare23 != null and spare23 != ''"> AND p.spare23 like concat('%', #{spare23}, '%')</if>
<if test="spare24 != null and spare24 != ''"> AND p.spare24 like concat('%', #{spare24}, '%')</if>
<if test="spare25 != null and spare25 != ''"> AND p.spare25 like concat('%', #{spare25}, '%')</if>
<if test="spare26 != null and spare26 != ''"> AND p.spare26 like concat('%', #{spare26}, '%')</if>
<if test="spare27 != null and spare27 != ''"> AND p.spare27 like concat('%', #{spare27}, '%')</if>
<if test="spare28 != null and spare28 != ''"> AND p.spare28 like concat('%', #{spare28}, '%')</if>
<if test="spare29 != null and spare29 != ''"> AND p.spare29 like concat('%', #{spare29}, '%')</if>
<if test="spare30 != null and spare30 != ''"> AND p.spare30 like concat('%', #{spare30}, '%')</if>
<if test="spare31 != null and spare31 != ''"> AND p.spare31 like concat('%', #{spare31}, '%')</if>
<if test="spare32 != null and spare32 != ''"> AND p.spare32 like concat('%', #{spare32}, '%')</if>
<if test="spare33 != null and spare33 != ''"> AND p.spare33 like concat('%', #{spare33}, '%')</if>
<if test="spare34 != null and spare34 != ''"> AND p.spare34 like concat('%', #{spare34}, '%')</if>
<if test="spare35 != null and spare35 != ''"> AND p.spare35 like concat('%', #{spare35}, '%')</if>
<if test="spare36 != null and spare36 != ''"> AND p.spare36 like concat('%', #{spare36}, '%')</if>
<if test="spare37 != null and spare37 != ''"> AND p.spare37 like concat('%', #{spare37}, '%')</if>
<if test="spare38 != null and spare38 != ''"> AND p.spare38 like concat('%', #{spare38}, '%')</if>
<if test="spare39 != null and spare39 != ''"> AND p.spare39 like concat('%', #{spare39}, '%')</if>
<if test="remark != null and remark != ''"> AND p.remark like concat('%', #{remark}, '%')</if>
<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="roadwayId != null and roadwayId != ''"> AND s.cargo_space_id like concat('%', #{roadwayId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
@@ -139,17 +253,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="unit != null">unit,</if>
<if test="price != null">,price,</if>
<if test="price != null">price,</if>
<if test="parentId != null">parent_id,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spare10 != null">spare10,</if>
<if test="spare11 != null">spare11,</if>
<if test="spare12 != null">spare12,</if>
<if test="spare13 != null">spare13,</if>
<if test="spare14 != null">spare14,</if>
<if test="spare15 != null">spare15,</if>
<if test="spare16 != null">spare16,</if>
<if test="spare17 != null">spare17,</if>
<if test="spare18 != null">spare18,</if>
<if test="spare19 != null">spare19,</if>
<if test="spare20 != null">spare20,</if>
<if test="spare21 != null">spare21,</if>
<if test="spare22 != null">spare22,</if>
<if test="spare23 != null">spare23,</if>
<if test="spare24 != null">spare24,</if>
<if test="spare25 != null">spare25,</if>
<if test="spare26 != null">spare26,</if>
<if test="spare27 != null">spare27,</if>
<if test="spare28 != null">spare28,</if>
<if test="spare29 != null">spare29,</if>
<if test="spare30 != null">spare30,</if>
<if test="spare31 != null">spare31,</if>
<if test="spare32 != null">spare32,</if>
<if test="spare33 != null">spare33,</if>
<if test="spare34 != null">spare34,</if>
<if test="spare35 != null">spare35,</if>
<if test="spare36 != null">spare36,</if>
<if test="spare37 != null">spare37,</if>
<if test="spare38 != null">spare38,</if>
<if test="spare39 != null">spare39,</if>
<if test="remark != null">remark,</if>
<if test="lotNo != null">lot_no,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="roadwayId != null">roadway_id,</if>
<if test="cargoSpaceId != null">cargo_space_id,</if>
<if test="quantity != null">quantity,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -158,17 +307,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="unit != null">#{unit},</if>
<if test="price != null">,#{price},</if>
<if test="price != null">#{price},</if>
<if test="parentId != null">#{parentId},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spare10 != null">#{spare10},</if>
<if test="spare11 != null">#{spare11},</if>
<if test="spare12 != null">#{spare12},</if>
<if test="spare13 != null">#{spare13},</if>
<if test="spare14 != null">#{spare14},</if>
<if test="spare15 != null">#{spare15},</if>
<if test="spare16 != null">#{spare16},</if>
<if test="spare17 != null">#{spare17},</if>
<if test="spare18 != null">#{spare18},</if>
<if test="spare19 != null">#{spare19},</if>
<if test="spare20 != null">#{spare20},</if>
<if test="spare21 != null">#{spare21},</if>
<if test="spare22 != null">#{spare22},</if>
<if test="spare23 != null">#{spare23},</if>
<if test="spare24 != null">#{spare24},</if>
<if test="spare25 != null">#{spare25},</if>
<if test="spare26 != null">#{spare26},</if>
<if test="spare27 != null">#{spare27},</if>
<if test="spare28 != null">#{spare28},</if>
<if test="spare29 != null">#{spare29},</if>
<if test="spare30 != null">#{spare30},</if>
<if test="spare31 != null">#{spare31},</if>
<if test="spare32 != null">#{spare32},</if>
<if test="spare33 != null">#{spare33},</if>
<if test="spare34 != null">#{spare34},</if>
<if test="spare35 != null">#{spare35},</if>
<if test="spare36 != null">#{spare36},</if>
<if test="spare37 != null">#{spare37},</if>
<if test="spare38 != null">#{spare38},</if>
<if test="spare39 != null">#{spare39},</if>
<if test="remark != null">#{remark},</if>
<if test="lotNo != null">#{lotNo},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="roadwayId != null">#{roadwayId},</if>
<if test="cargoSpaceId != null">#{cargoSpaceId},</if>
<if test="quantity != null">#{quantity},</if>
</trim>
</insert>
@@ -181,16 +365,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spec != null">spec = #{spec},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="price != null">price = #{price},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="remark != null">spare7 = #{remark},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="spare10 != null">spare10 = #{spare10},</if>
<if test="spare11 != null">spare11 = #{spare11},</if>
<if test="spare12 != null">spare12 = #{spare12},</if>
<if test="spare13 != null">spare13 = #{spare13},</if>
<if test="spare14 != null">spare14 = #{spare14},</if>
<if test="spare15 != null">spare15 = #{spare15},</if>
<if test="spare16 != null">spare16 = #{spare16},</if>
<if test="spare17 != null">spare17 = #{spare17},</if>
<if test="spare18 != null">spare18 = #{spare18},</if>
<if test="spare19 != null">spare19 = #{spare19},</if>
<if test="spare20 != null">spare20 = #{spare20},</if>
<if test="spare21 != null">spare21 = #{spare21},</if>
<if test="spare22 != null">spare22 = #{spare22},</if>
<if test="spare23 != null">spare23 = #{spare23},</if>
<if test="spare24 != null">spare24 = #{spare24},</if>
<if test="spare25 != null">spare25 = #{spare25},</if>
<if test="spare26 != null">spare26 = #{spare26},</if>
<if test="spare27 != null">spare27 = #{spare27},</if>
<if test="spare28 != null">spare28 = #{spare28},</if>
<if test="spare29 != null">spare29 = #{spare29},</if>
<if test="spare30 != null">spare30 = #{spare30},</if>
<if test="spare31 != null">spare31 = #{spare31},</if>
<if test="spare32 != null">spare32 = #{spare32},</if>
<if test="spare33 != null">spare33 = #{spare33},</if>
<if test="spare34 != null">spare34 = #{spare34},</if>
<if test="spare35 != null">spare35 = #{spare35},</if>
<if test="spare36 != null">spare36 = #{spare36},</if>
<if test="spare37 != null">spare37 = #{spare37},</if>
<if test="spare38 != null">spare38 = #{spare38},</if>
<if test="spare39 != null">spare39 = #{spare39},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="roadwayId != null">roadway_id = #{roadwayId},</if>
<if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
<if test="quantity != null">quantity = #{quantity},</if>
</trim>
where only_identity = #{onlyIdentity}

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

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper">
<resultMap type="ViewInJobFlow" id="ViewInJobFlowResult">
<result property="jobId" column="job_id" />
<result property="jobDetailId" column="job_detail_id" />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="executionPhase" column="execution_phase" />
<result property="inOrOut" column="in_or_out" />
<result property="entranceId" column="entrance_id" />
<result property="productId" column="product_id" />
<result property="wlbh" column="wlbh" />
<result property="lotNo" column="lot_no" />
<result property="stackingId" column="stacking_id" />
<result property="stockStatus" column="stock_status" />
@@ -31,26 +31,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="startTime" column="start_time" />
<result property="finishTime" column="finish_time" />
<result property="warehouseId" column="warehouse_id" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<result property="unit" column="unit" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="parentId" column="parent_id" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="remark" column="remark" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productName" column="product_name" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
<result property="spare9" column="spare9" />
<result property="spare10" column="spare10" />
<result property="spare11" column="spare11" />
<result property="spare12" column="spare12" />
<result property="spare13" column="spare13" />
<result property="spare14" column="spare14" />
<result property="spare15" column="spare15" />
<result property="spare16" column="spare16" />
<result property="spare17" column="spare17" />
<result property="spare18" column="spare18" />
<result property="spare19" column="spare19" />
<result property="spare20" column="spare20" />
<result property="spare21" column="spare21" />
<result property="spare22" column="spare22" />
<result property="spare23" column="spare23" />
<result property="spare24" column="spare24" />
<result property="spare25" column="spare25" />
<result property="spare26" column="spare26" />
<result property="spare27" column="spare27" />
<result property="spare28" column="spare28" />
<result property="spare29" column="spare29" />
<result property="spare30" column="spare30" />
<result property="spare31" column="spare31" />
<result property="spare32" column="spare32" />
<result property="spare33" column="spare33" />
<result property="spare34" column="spare34" />
<result property="spare35" column="spare35" />
<result property="spare36" column="spare36" />
<result property="spare37" column="spare37" />
<result property="spare38" column="spare38" />
<result property="spare39" column="spare39" />
</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, product_id, 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_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_in_job_flow vijf
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
</sql>
<select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
<include refid="selectViewInJobFlowVo"/>
<where>
<where>
<if test="jobId != null and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
<if test="jobDetailId != null and jobDetailId != ''"> and job_detail_id like concat('%', #{jobDetailId}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
@@ -66,10 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="executionPhase != null and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
<if test="inOrOut != null and inOrOut != ''"> and in_or_out like concat('%', #{inOrOut}, '%')</if>
<if test="entranceId != null and entranceId != ''"> and entrance_id like concat('%', #{entranceId}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="wlbh != null and wlbh != ''"> and wlbh like concat('%', #{wlbh}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="inQuantity != null and inQuantity != ''"> and in_quantity like concat('%', #{inQuantity}, '%')</if>
<if test="inOrOutId != null and inOrOutId != ''"> and in_or_out_id like concat('%', #{inOrOutId}, '%')</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and in_or_out_d_id like concat('%', #{inOrOutDId}, '%')</if>
@@ -77,22 +114,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null and startTime != ''"> and start_time like concat('%', #{startTime}, '%')</if>
<if test="finishTime != null and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="parentId != null and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
<if test="spare9 != null and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
<if test="spare10 != null and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
<if test="spare11 != null and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
<if test="spare12 != null and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
<if test="spare13 != null and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
<if test="spare14 != null and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
<if test="spare15 != null and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
<if test="spare16 != null and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
<if test="spare17 != null and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
<if test="spare18 != null and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
<if test="spare19 != null and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
<if test="spare20 != null and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
<if test="spare21 != null and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
<if test="spare22 != null and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
<if test="spare23 != null and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
<if test="spare24 != null and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
<if test="spare25 != null and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
<if test="spare26 != null and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
<if test="spare27 != null and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
<if test="spare28 != null and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
<if test="spare29 != null and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
<if test="spare30 != null and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
<if test="spare31 != null and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
<if test="spare32 != null and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
<if test="spare33 != null and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
<if test="spare34 != null and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
<if test="spare35 != null and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
<if test="spare36 != null and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
<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>
</where>
</select>
<select id="selectViewInJobFlowByJobId" parameterType="String" resultMap="ViewInJobFlowResult">
<include refid="selectViewInJobFlowVo"/>
where job_id = #{jobId}
@@ -116,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="executionPhase != null">execution_phase,</if>
<if test="inOrOut != null">in_or_out,</if>
<if test="entranceId != null">entrance_id,</if>
<if test="productId != null">product_id,</if>
<if test="wlbh != null">wlbh,</if>
<if test="lotNo != null">lot_no,</if>
<if test="stackingId != null">stacking_id,</if>
<if test="stockStatus != null">stock_status,</if>
@@ -127,17 +199,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null">start_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="unit != null">unit,</if>
<if test="productGuid != null">product_guid,</if>
<if test="productId != null">product_id,</if>
<if test="parentId != null">parent_id,</if>
<if test="price != null">price,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="spec != null">spec,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productName != null">product_name,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spare10 != null">spare10,</if>
<if test="spare11 != null">spare11,</if>
<if test="spare12 != null">spare12,</if>
<if test="spare13 != null">spare13,</if>
<if test="spare14 != null">spare14,</if>
<if test="spare15 != null">spare15,</if>
<if test="spare16 != null">spare16,</if>
<if test="spare17 != null">spare17,</if>
<if test="spare18 != null">spare18,</if>
<if test="spare19 != null">spare19,</if>
<if test="spare20 != null">spare20,</if>
<if test="spare21 != null">spare21,</if>
<if test="spare22 != null">spare22,</if>
<if test="spare23 != null">spare23,</if>
<if test="spare24 != null">spare24,</if>
<if test="spare25 != null">spare25,</if>
<if test="spare26 != null">spare26,</if>
<if test="spare27 != null">spare27,</if>
<if test="spare28 != null">spare28,</if>
<if test="spare29 != null">spare29,</if>
<if test="spare30 != null">spare30,</if>
<if test="spare31 != null">spare31,</if>
<if test="spare32 != null">spare32,</if>
<if test="spare33 != null">spare33,</if>
<if test="spare34 != null">spare34,</if>
<if test="spare35 != null">spare35,</if>
<if test="spare36 != null">spare36,</if>
<if test="spare37 != null">spare37,</if>
<if test="spare38 != null">spare38,</if>
<if test="spare39 != null">spare39,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jobId != null and jobId != ''">#{jobId},</if>
@@ -155,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="executionPhase != null">#{executionPhase},</if>
<if test="inOrOut != null">#{inOrOut},</if>
<if test="entranceId != null">#{entranceId},</if>
<if test="productId != null">#{productId},</if>
<if test="wlbh != null">#{wlbh},</if>
<if test="lotNo != null">#{lotNo},</if>
<if test="stackingId != null">#{stackingId},</if>
<if test="stockStatus != null">#{stockStatus},</if>
@@ -166,17 +275,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null">#{startTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="unit != null">#{unit},</if>
<if test="productGuid != null">#{productGuid},</if>
<if test="productId != null">#{productId},</if>
<if test="parentId != null">#{parentId},</if>
<if test="price != null">#{price},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="spec != null">#{spec},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productName != null">#{productName},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spare10 != null">#{spare10},</if>
<if test="spare11 != null">#{spare11},</if>
<if test="spare12 != null">#{spare12},</if>
<if test="spare13 != null">#{spare13},</if>
<if test="spare14 != null">#{spare14},</if>
<if test="spare15 != null">#{spare15},</if>
<if test="spare16 != null">#{spare16},</if>
<if test="spare17 != null">#{spare17},</if>
<if test="spare18 != null">#{spare18},</if>
<if test="spare19 != null">#{spare19},</if>
<if test="spare20 != null">#{spare20},</if>
<if test="spare21 != null">#{spare21},</if>
<if test="spare22 != null">#{spare22},</if>
<if test="spare23 != null">#{spare23},</if>
<if test="spare24 != null">#{spare24},</if>
<if test="spare25 != null">#{spare25},</if>
<if test="spare26 != null">#{spare26},</if>
<if test="spare27 != null">#{spare27},</if>
<if test="spare28 != null">#{spare28},</if>
<if test="spare29 != null">#{spare29},</if>
<if test="spare30 != null">#{spare30},</if>
<if test="spare31 != null">#{spare31},</if>
<if test="spare32 != null">#{spare32},</if>
<if test="spare33 != null">#{spare33},</if>
<if test="spare34 != null">#{spare34},</if>
<if test="spare35 != null">#{spare35},</if>
<if test="spare36 != null">#{spare36},</if>
<if test="spare37 != null">#{spare37},</if>
<if test="spare38 != null">#{spare38},</if>
<if test="spare39 != null">#{spare39},</if>
</trim>
</insert>
@@ -197,7 +343,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="executionPhase != null">execution_phase = #{executionPhase},</if>
<if test="inOrOut != null">in_or_out = #{inOrOut},</if>
<if test="entranceId != null">entrance_id = #{entranceId},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="wlbh != null">wlbh = #{wlbh},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="stackingId != null">stacking_id = #{stackingId},</if>
<if test="stockStatus != null">stock_status = #{stockStatus},</if>
@@ -208,17 +354,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null">start_time = #{startTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="price != null">price = #{price},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="spare10 != null">spare10 = #{spare10},</if>
<if test="spare11 != null">spare11 = #{spare11},</if>
<if test="spare12 != null">spare12 = #{spare12},</if>
<if test="spare13 != null">spare13 = #{spare13},</if>
<if test="spare14 != null">spare14 = #{spare14},</if>
<if test="spare15 != null">spare15 = #{spare15},</if>
<if test="spare16 != null">spare16 = #{spare16},</if>
<if test="spare17 != null">spare17 = #{spare17},</if>
<if test="spare18 != null">spare18 = #{spare18},</if>
<if test="spare19 != null">spare19 = #{spare19},</if>
<if test="spare20 != null">spare20 = #{spare20},</if>
<if test="spare21 != null">spare21 = #{spare21},</if>
<if test="spare22 != null">spare22 = #{spare22},</if>
<if test="spare23 != null">spare23 = #{spare23},</if>
<if test="spare24 != null">spare24 = #{spare24},</if>
<if test="spare25 != null">spare25 = #{spare25},</if>
<if test="spare26 != null">spare26 = #{spare26},</if>
<if test="spare27 != null">spare27 = #{spare27},</if>
<if test="spare28 != null">spare28 = #{spare28},</if>
<if test="spare29 != null">spare29 = #{spare29},</if>
<if test="spare30 != null">spare30 = #{spare30},</if>
<if test="spare31 != null">spare31 = #{spare31},</if>
<if test="spare32 != null">spare32 = #{spare32},</if>
<if test="spare33 != null">spare33 = #{spare33},</if>
<if test="spare34 != null">spare34 = #{spare34},</if>
<if test="spare35 != null">spare35 = #{spare35},</if>
<if test="spare36 != null">spare36 = #{spare36},</if>
<if test="spare37 != null">spare37 = #{spare37},</if>
<if test="spare38 != null">spare38 = #{spare38},</if>
<if test="spare39 != null">spare39 = #{spare39},</if>
</trim>
where job_id = #{jobId}
</update>
@@ -228,9 +411,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteViewInJobFlowByJobIds" parameterType="String">
delete from view_in_job_flow where job_id in
delete from view_in_job_flow where job_id in
<foreach item="jobId" collection="array" open="(" separator="," close=")">
#{jobId}
</foreach>
</delete>
</mapper>
</mapper>

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

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper">
<resultMap type="ViewOutJobFlow" id="ViewOutJobFlowResult">
<result property="jobId" column="job_id" />
<result property="jobDetailId" column="job_detail_id" />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="executionPhase" column="execution_phase" />
<result property="inOrOut" column="in_or_out" />
<result property="exitId" column="exit_id" />
<result property="productId" column="product_id" />
<result property="wlbh" column="wlbh" />
<result property="lotNo" column="lot_no" />
<result property="stackingId" column="stacking_id" />
<result property="stockStatus" column="stock_status" />
@@ -32,27 +32,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="startTime" column="start_time" />
<result property="finishTime" column="finish_time" />
<result property="warehouseId" column="warehouse_id" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<result property="unit" column="unit" />
<result property="customerName" column="customer_name" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="parentId" column="parent_id" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="remark" column="remark" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productName" column="product_name" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
<result property="spare9" column="spare9" />
<result property="spare10" column="spare10" />
<result property="spare11" column="spare11" />
<result property="spare12" column="spare12" />
<result property="spare13" column="spare13" />
<result property="spare14" column="spare14" />
<result property="spare15" column="spare15" />
<result property="spare16" column="spare16" />
<result property="spare17" column="spare17" />
<result property="spare18" column="spare18" />
<result property="spare19" column="spare19" />
<result property="spare20" column="spare20" />
<result property="spare21" column="spare21" />
<result property="spare22" column="spare22" />
<result property="spare23" column="spare23" />
<result property="spare24" column="spare24" />
<result property="spare25" column="spare25" />
<result property="spare26" column="spare26" />
<result property="spare27" column="spare27" />
<result property="spare28" column="spare28" />
<result property="spare29" column="spare29" />
<result property="spare30" column="spare30" />
<result property="spare31" column="spare31" />
<result property="spare32" column="spare32" />
<result property="spare33" column="spare33" />
<result property="spare34" column="spare34" />
<result property="spare35" column="spare35" />
<result property="spare36" column="spare36" />
<result property="spare37" column="spare37" />
<result property="spare38" column="spare38" />
<result property="spare39" column="spare39" />
<result property="customerName" column="customer_name" />
</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, product_id, 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_name, spec, unit, customer_name, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_out_job_flow vojf
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
</sql>
<select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">
<include refid="selectViewOutJobFlowVo"/>
<where>
<where>
<if test="jobId != null and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
<if test="jobDetailId != null and jobDetailId != ''"> and job_detail_id like concat('%', #{jobDetailId}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
@@ -66,12 +103,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
<if test="priority != null "> and priority like concat('%', #{priority}, '%')</if>
<if test="executionPhase != null and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
<if test="inOrOut != null and inOrOut != ''"> and in_or_out like concat('%', #{inOrOut}, '%')</if>
<if test="inOrOut != null and inOrOut != ''"> and in_or_out = #{inOrOut}</if>
<if test="exitId != null and exitId != ''"> and exit_id like concat('%', #{exitId}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="wlbh != null and wlbh != ''"> and wlbh like concat('%', #{wlbh}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="outQuantity != null and outQuantity != ''"> and out_quantity like concat('%', #{outQuantity}, '%')</if>
<if test="giveNum != null and giveNum != ''"> and give_num like concat('%', #{giveNum}, '%')</if>
<if test="inOrOutId != null and inOrOutId != ''"> and in_or_out_id like concat('%', #{inOrOutId}, '%')</if>
@@ -80,23 +117,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null and startTime != ''"> and start_time like concat('%', #{startTime}, '%')</if>
<if test="finishTime != null and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="parentId != null and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
<if test="spare9 != null and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
<if test="spare10 != null and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
<if test="spare11 != null and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
<if test="spare12 != null and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
<if test="spare13 != null and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
<if test="spare14 != null and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
<if test="spare15 != null and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
<if test="spare16 != null and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
<if test="spare17 != null and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
<if test="spare18 != null and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
<if test="spare19 != null and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
<if test="spare20 != null and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
<if test="spare21 != null and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
<if test="spare22 != null and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
<if test="spare23 != null and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
<if test="spare24 != null and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
<if test="spare25 != null and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
<if test="spare26 != null and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
<if test="spare27 != null and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
<if test="spare28 != null and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
<if test="spare29 != null and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
<if test="spare30 != null and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
<if test="spare31 != null and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
<if test="spare32 != null and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
<if test="spare33 != null and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
<if test="spare34 != null and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
<if test="spare35 != null and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
<if test="spare36 != null and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
<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="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
</where>
</select>
<select id="selectViewOutJobFlowByJobId" parameterType="String" resultMap="ViewOutJobFlowResult">
<include refid="selectViewOutJobFlowVo"/>
where job_id = #{jobId}
@@ -120,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="executionPhase != null">execution_phase,</if>
<if test="inOrOut != null">in_or_out,</if>
<if test="exitId != null">exit_id,</if>
<if test="productId != null">product_id,</if>
<if test="wlbh != null">wlbh,</if>
<if test="lotNo != null">lot_no,</if>
<if test="stackingId != null">stacking_id,</if>
<if test="stockStatus != null">stock_status,</if>
@@ -132,18 +204,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null">start_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="unit != null">unit,</if>
<if test="customerName != null">customer_name,</if>
<if test="productGuid != null">product_guid,</if>
<if test="productId != null">product_id,</if>
<if test="parentId != null">parent_id,</if>
<if test="price != null">price,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="spec != null">spec,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productName != null">product_name,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spare10 != null">spare10,</if>
<if test="spare11 != null">spare11,</if>
<if test="spare12 != null">spare12,</if>
<if test="spare13 != null">spare13,</if>
<if test="spare14 != null">spare14,</if>
<if test="spare15 != null">spare15,</if>
<if test="spare16 != null">spare16,</if>
<if test="spare17 != null">spare17,</if>
<if test="spare18 != null">spare18,</if>
<if test="spare19 != null">spare19,</if>
<if test="spare20 != null">spare20,</if>
<if test="spare21 != null">spare21,</if>
<if test="spare22 != null">spare22,</if>
<if test="spare23 != null">spare23,</if>
<if test="spare24 != null">spare24,</if>
<if test="spare25 != null">spare25,</if>
<if test="spare26 != null">spare26,</if>
<if test="spare27 != null">spare27,</if>
<if test="spare28 != null">spare28,</if>
<if test="spare29 != null">spare29,</if>
<if test="spare30 != null">spare30,</if>
<if test="spare31 != null">spare31,</if>
<if test="spare32 != null">spare32,</if>
<if test="spare33 != null">spare33,</if>
<if test="spare34 != null">spare34,</if>
<if test="spare35 != null">spare35,</if>
<if test="spare36 != null">spare36,</if>
<if test="spare37 != null">spare37,</if>
<if test="spare38 != null">spare38,</if>
<if test="spare39 != null">spare39,</if>
<if test="customerName != null">customer_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jobId != null and jobId != ''">#{jobId},</if>
@@ -161,7 +270,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="executionPhase != null">#{executionPhase},</if>
<if test="inOrOut != null">#{inOrOut},</if>
<if test="exitId != null">#{exitId},</if>
<if test="productId != null">#{productId},</if>
<if test="wlbh != null">#{wlbh},</if>
<if test="lotNo != null">#{lotNo},</if>
<if test="stackingId != null">#{stackingId},</if>
<if test="stockStatus != null">#{stockStatus},</if>
@@ -173,18 +282,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null">#{startTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="unit != null">#{unit},</if>
<if test="customerName != null">#{customerName},</if>
<if test="productGuid != null">#{productGuid},</if>
<if test="productId != null">#{productId},</if>
<if test="parentId != null">#{parentId},</if>
<if test="price != null">#{price},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="spec != null">#{spec},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productName != null">#{productName},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spare10 != null">#{spare10},</if>
<if test="spare11 != null">#{spare11},</if>
<if test="spare12 != null">#{spare12},</if>
<if test="spare13 != null">#{spare13},</if>
<if test="spare14 != null">#{spare14},</if>
<if test="spare15 != null">#{spare15},</if>
<if test="spare16 != null">#{spare16},</if>
<if test="spare17 != null">#{spare17},</if>
<if test="spare18 != null">#{spare18},</if>
<if test="spare19 != null">#{spare19},</if>
<if test="spare20 != null">#{spare20},</if>
<if test="spare21 != null">#{spare21},</if>
<if test="spare22 != null">#{spare22},</if>
<if test="spare23 != null">#{spare23},</if>
<if test="spare24 != null">#{spare24},</if>
<if test="spare25 != null">#{spare25},</if>
<if test="spare26 != null">#{spare26},</if>
<if test="spare27 != null">#{spare27},</if>
<if test="spare28 != null">#{spare28},</if>
<if test="spare29 != null">#{spare29},</if>
<if test="spare30 != null">#{spare30},</if>
<if test="spare31 != null">#{spare31},</if>
<if test="spare32 != null">#{spare32},</if>
<if test="spare33 != null">#{spare33},</if>
<if test="spare34 != null">#{spare34},</if>
<if test="spare35 != null">#{spare35},</if>
<if test="spare36 != null">#{spare36},</if>
<if test="spare37 != null">#{spare37},</if>
<if test="spare38 != null">#{spare38},</if>
<if test="spare39 != null">#{spare39},</if>
<if test="customerName != null">#{customerName},</if>
</trim>
</insert>
@@ -205,7 +351,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="executionPhase != null">execution_phase = #{executionPhase},</if>
<if test="inOrOut != null">in_or_out = #{inOrOut},</if>
<if test="exitId != null">exit_id = #{exitId},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="wlbh != null">wlbh = #{wlbh},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="stackingId != null">stacking_id = #{stackingId},</if>
<if test="stockStatus != null">stock_status = #{stockStatus},</if>
@@ -217,18 +363,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null">start_time = #{startTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="price != null">price = #{price},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="spare10 != null">spare10 = #{spare10},</if>
<if test="spare11 != null">spare11 = #{spare11},</if>
<if test="spare12 != null">spare12 = #{spare12},</if>
<if test="spare13 != null">spare13 = #{spare13},</if>
<if test="spare14 != null">spare14 = #{spare14},</if>
<if test="spare15 != null">spare15 = #{spare15},</if>
<if test="spare16 != null">spare16 = #{spare16},</if>
<if test="spare17 != null">spare17 = #{spare17},</if>
<if test="spare18 != null">spare18 = #{spare18},</if>
<if test="spare19 != null">spare19 = #{spare19},</if>
<if test="spare20 != null">spare20 = #{spare20},</if>
<if test="spare21 != null">spare21 = #{spare21},</if>
<if test="spare22 != null">spare22 = #{spare22},</if>
<if test="spare23 != null">spare23 = #{spare23},</if>
<if test="spare24 != null">spare24 = #{spare24},</if>
<if test="spare25 != null">spare25 = #{spare25},</if>
<if test="spare26 != null">spare26 = #{spare26},</if>
<if test="spare27 != null">spare27 = #{spare27},</if>
<if test="spare28 != null">spare28 = #{spare28},</if>
<if test="spare29 != null">spare29 = #{spare29},</if>
<if test="spare30 != null">spare30 = #{spare30},</if>
<if test="spare31 != null">spare31 = #{spare31},</if>
<if test="spare32 != null">spare32 = #{spare32},</if>
<if test="spare33 != null">spare33 = #{spare33},</if>
<if test="spare34 != null">spare34 = #{spare34},</if>
<if test="spare35 != null">spare35 = #{spare35},</if>
<if test="spare36 != null">spare36 = #{spare36},</if>
<if test="spare37 != null">spare37 = #{spare37},</if>
<if test="spare38 != null">spare38 = #{spare38},</if>
<if test="spare39 != null">spare39 = #{spare39},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
</trim>
where job_id = #{jobId}
</update>
@@ -238,9 +421,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteViewOutJobFlowByJobIds" parameterType="String">
delete from view_out_job_flow where job_id in
delete from view_out_job_flow where job_id in
<foreach item="jobId" collection="array" open="(" separator="," close=")">
#{jobId}
</foreach>
</delete>
</mapper>
</mapper>

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

@@ -38,46 +38,78 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectViewStockDetailVo">
select only_identity,stock_status,product_status, stock_id, cargo_space_id, tray_code, quantity, job_id, lot_no, stockin_detail_id, in_date, warehouse_id, stacking_id, cargo_space_name, roadway_id, cargo_space_status, locked, product_id, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8,warehouse_name
from view_stock_detail vsd
SELECT
ROW_NUMBER() OVER (ORDER BY s.stock_id ASC) AS only_identity,
s.stock_id,
s.cargo_space_id,
s.tray_code,
s.quantity,
s.job_id,
s.lot_no,
s.stockin_detail_id,
s.in_date,
s.warehouse_id,
s.stacking_id,
cs.cargo_space_name,
cs.roadway_id,
cs.status AS cargo_space_status,
s.stock_status AS stock_status,
s.product_status AS product_status,
cs.locked,
p.product_guid,
p.product_id,
p.product_name,
p.spec,
p.unit,
p.price,
p.spare1,
p.spare2,
p.spare5,
p.spare6,
p.spare7,
p.spare8,
p.remark,
bw.warehouse_name
FROM
bas_stock s
LEFT JOIN bas_cargo_space cs ON cs.cargo_space_id = s.cargo_space_id
LEFT JOIN bas_product p ON p.product_guid = s.product_guid
LEFT JOIN bas_warehouse bw on s.warehouse_id = bw.warehouse_id
WHERE
cs.status = '2'
</sql>
<select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
<include refid="selectViewStockDetailVo"/>
<where>
<if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if>
<if test="stockId != null and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
<if test="quantity != null and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
<if test="jobId != null and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
<if test="inDate != null and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="cargoSpaceStatus != null and cargoSpaceStatus != ''"> and cargo_space_status like concat('%', #{cargoSpaceStatus}, '%')</if>
<if test="locked != null and locked != ''"> and locked like concat('%', #{locked}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
<if test="warehouseName != null and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="productStatus != null and productStatus != ''"> and product_status like concat('%', #{productStatus}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
</where>
<if test="stockId != null and stockId != ''"> and s.stock_id = #{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="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>
<if test="stockinDetailId != null and stockinDetailId != ''"> and s.stockin_detail_id = #{stockinDetailId}</if>
<if test="inDate != null and inDate != ''"> and s.in_date = #{inDate}</if>
<if test="warehouseId != null and warehouseId != ''"> and s.warehouse_id = #{warehouseId}</if>
<if test="warehouseName != null and warehouseName != ''"> and bw.warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="stackingId != null and stackingId != ''"> and s.stacking_id = #{stackingId}</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and cs.cargo_space_name = #{cargoSpaceName}</if>
<if test="roadwayId != null and roadwayId != ''"> and cs.roadway_id = #{roadwayId}</if>
<if test="cargoSpaceStatus != null and cargoSpaceStatus != ''"> and cs.status = #{cargoSpaceStatus}</if>
<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="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>
<if test="price != null and price != ''"> and p.price = #{price}</if>
<if test="spare1 != null and spare1 != ''"> and p.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and p.spare2 = #{spare2}</if>
<if test="spare5 != null and spare5 != ''"> and p.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and p.spare6 = #{spare6}</if>
<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>
</select>
<select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">

358
ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml
View File

@@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="lotNo" column="lot_no" />
<result property="inDate" column="in_date" />
<result property="backDate" column="back_date" />
<result property="productGuid" column="product_guid" />
<result property="quantity" column="quantity" />
<result property="jobId" column="job_id" />
<result property="trayCode" column="tray_code" />
@@ -23,29 +22,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inClassId" column="in_class_id" />
<result property="warehouseId" column="warehouse_id" />
<result property="stackingId" column="stacking_id" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productId" column="product_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="address" column="address" />
<result property="cDesc" column="c_desc" />
<result property="warehouseKind" column="warehouse_kind" />
<result property="warehouseType" column="warehouse_type" />
<result property="isCurrent" column="is_current" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="parentId" column="parent_id" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="enName" column="enName" />
<result property="weight" column="weight" />
<result property="longMM" column="longMM" />
<result property="wide" column="wide" />
<result property="hight" column="hight" />
<result property="volume" column="volume" />
<result property="remark" column="remark" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productName" column="product_name" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="spare10" column="spare10" />
<result property="spare11" column="spare11" />
<result property="spare12" column="spare12" />
<result property="spare13" column="spare13" />
<result property="spare14" column="spare14" />
<result property="spare15" column="spare15" />
<result property="spare16" column="spare16" />
<result property="spare17" column="spare17" />
<result property="spare18" column="spare18" />
<result property="spare19" column="spare19" />
<result property="spare20" column="spare20" />
<result property="spare21" column="spare21" />
<result property="spare22" column="spare22" />
<result property="spare23" column="spare23" />
<result property="spare24" column="spare24" />
<result property="spare25" column="spare25" />
<result property="spare26" column="spare26" />
<result property="spare27" column="spare27" />
<result property="spare28" column="spare28" />
<result property="spare29" column="spare29" />
<result property="spare30" column="spare30" />
<result property="spare31" column="spare31" />
<result property="spare32" column="spare32" />
<result property="spare33" column="spare33" />
<result property="spare34" column="spare34" />
<result property="spare35" column="spare35" />
<result property="spare36" column="spare36" />
<result property="spare37" column="spare37" />
<result property="spare38" column="spare38" />
<result property="spare39" column="spare39" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="roadwayId" column="roadway_id" />
<result property="cargoAreaId" column="cargo_area_id" />
@@ -65,69 +95,99 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectViewStockSecureVo">
select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, price, unit, spec, enName, weight, longMM, wide, hight, volume, product_name, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_secure
select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, 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, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_secure
</sql>
<select id="selectViewStockSecureList" parameterType="ViewStockSecure" resultMap="ViewStockSecureResult">
<include refid="selectViewStockSecureVo"/>
<where>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
<if test="stockId != null and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="productStatus != null and productStatus != ''"> and product_status = #{productStatus}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and in_date = #{inDate}</if>
<if test="backDate != null and backDate != ''"> and back_date = #{backDate}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
<if test="outQuantity != null and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="inDate != null and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
<if test="backDate != null and backDate != ''"> and back_date like concat('%', #{backDate}, '%')</if>
<if test="quantity != null and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
<if test="jobId != null and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
<if test="outQuantity != null and outQuantity != ''"> and out_quantity like concat('%', #{outQuantity}, '%')</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<if test="inClassId != null and inClassId != ''"> and in_class_id = #{inClassId}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id = #{stackingId}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="productId != null and productId != ''"> and product_id like concat('%',#{productId}, '%')</if>
<if test="inClassId != null and inClassId != ''"> and in_class_id like concat('%', #{inClassId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
<if test="warehouseName != null and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="address != null and address != ''"> and address = #{address}</if>
<if test="cDesc != null and cDesc != ''"> and c_desc = #{cDesc}</if>
<if test="warehouseKind != null and warehouseKind != ''"> and warehouse_kind = #{warehouseKind}</if>
<if test="warehouseType != null and warehouseType != ''"> and warehouse_type = #{warehouseType}</if>
<if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if>
<if test="cDesc != null and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
<if test="warehouseKind != null and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
<if test="warehouseType != null and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
<if test="isCurrent != null and isCurrent != ''"> and is_current = #{isCurrent}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="enName != null and enName != ''"> and enName like concat('%', #{enName}, '%')</if>
<if test="weight != null and weight != ''"> and weight = #{weight}</if>
<if test="longMM != null and longMM != ''"> and longMM = #{longMM}</if>
<if test="wide != null and wide != ''"> and wide = #{wide}</if>
<if test="hight != null and hight != ''"> and hight = #{hight}</if>
<if test="volume != null and volume != ''"> and volume = #{volume}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="parentId != null and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare9 != null and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
<if test="spare10 != null and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
<if test="spare11 != null and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
<if test="spare12 != null and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
<if test="spare13 != null and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
<if test="spare14 != null and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
<if test="spare15 != null and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
<if test="spare16 != null and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
<if test="spare17 != null and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
<if test="spare18 != null and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
<if test="spare19 != null and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
<if test="spare20 != null and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
<if test="spare21 != null and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
<if test="spare22 != null and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
<if test="spare23 != null and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
<if test="spare24 != null and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
<if test="spare25 != null and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
<if test="spare26 != null and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
<if test="spare27 != null and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
<if test="spare28 != null and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
<if test="spare29 != null and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
<if test="spare30 != null and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
<if test="spare31 != null and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
<if test="spare32 != null and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
<if test="spare33 != null and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
<if test="spare34 != null and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
<if test="spare35 != null and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
<if test="spare36 != null and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
<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="cargoSpaceName != null and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
<if test="cargoAreaId != null and cargoAreaId != ''"> and cargo_area_id = #{cargoAreaId}</if>
<if test="theType != null and theType != ''"> and the_type = #{theType}</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="cargoAreaId != null and cargoAreaId != ''"> and cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
<if test="theType != null and theType != ''"> and the_type like concat('%', #{theType}, '%')</if>
<if test="theTypeName != null and theTypeName != ''"> and the_type_name like concat('%', #{theTypeName}, '%')</if>
<if test="thePlatoon != null "> and the_platoon = #{thePlatoon}</if>
<if test="theColumn != null "> and the_column = #{theColumn}</if>
<if test="theFloor != null "> and the_floor = #{theFloor}</if>
<if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
<if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
<if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
<if test="cargoStatus != null and cargoStatus != ''"> and cargo_status = #{cargoStatus}</if>
<if test="locked != null and locked != ''"> and locked = #{locked}</if>
<if test="cargoHight != null and cargoHight != ''"> and cargo_hight = #{cargoHight}</if>
<if test="issDouble != null and issDouble != ''"> and iss_double = #{issDouble}</if>
<if test="groupCodingNo != null and groupCodingNo != ''"> and group_coding_no = #{groupCodingNo}</if>
<if test="groupCoding != null and groupCoding != ''"> and group_coding = #{groupCoding}</if>
<if test="cargoSpaceLogo != null and cargoSpaceLogo != ''"> and cargo_space_logo = #{cargoSpaceLogo}</if>
<if test="thisCargoArea != null and thisCargoArea != ''"> and this_cargo_area = #{thisCargoArea}</if>
<if test="cargoHight != null and cargoHight != ''"> and cargo_hight like concat('%', #{cargoHight}, '%')</if>
<if test="issDouble != null and issDouble != ''"> and iss_double like concat('%', #{issDouble}, '%')</if>
<if test="groupCodingNo != null and groupCodingNo != ''"> and group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
<if test="groupCoding != null and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
<if test="cargoSpaceLogo != null and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
<if test="thisCargoArea != null and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
</where>
</select>
@@ -146,7 +206,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lotNo != null">lot_no,</if>
<if test="inDate != null">in_date,</if>
<if test="backDate != null">back_date,</if>
<if test="productGuid != null">product_guid,</if>
<if test="quantity != null">quantity,</if>
<if test="jobId != null">job_id,</if>
<if test="trayCode != null">tray_code,</if>
@@ -157,29 +216,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inClassId != null">in_class_id,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="stackingId != null">stacking_id,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productId != null">product_id,</if>
<if test="warehouseName != null">warehouse_name,</if>
<if test="address != null">address,</if>
<if test="cDesc != null">c_desc,</if>
<if test="warehouseKind != null">warehouse_kind,</if>
<if test="warehouseType != null">warehouse_type,</if>
<if test="isCurrent != null">is_current,</if>
<if test="productGuid != null">product_guid,</if>
<if test="productId != null">product_id,</if>
<if test="parentId != null">parent_id,</if>
<if test="price != null">price,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="spec != null">spec,</if>
<if test="enName != null">enName,</if>
<if test="weight != null">weight,</if>
<if test="longMM != null">longMM,</if>
<if test="wide != null">wide,</if>
<if test="hight != null">hight,</if>
<if test="volume != null">volume,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productName != null">product_name,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spare10 != null">spare10,</if>
<if test="spare11 != null">spare11,</if>
<if test="spare12 != null">spare12,</if>
<if test="spare13 != null">spare13,</if>
<if test="spare14 != null">spare14,</if>
<if test="spare15 != null">spare15,</if>
<if test="spare16 != null">spare16,</if>
<if test="spare17 != null">spare17,</if>
<if test="spare18 != null">spare18,</if>
<if test="spare19 != null">spare19,</if>
<if test="spare20 != null">spare20,</if>
<if test="spare21 != null">spare21,</if>
<if test="spare22 != null">spare22,</if>
<if test="spare23 != null">spare23,</if>
<if test="spare24 != null">spare24,</if>
<if test="spare25 != null">spare25,</if>
<if test="spare26 != null">spare26,</if>
<if test="spare27 != null">spare27,</if>
<if test="spare28 != null">spare28,</if>
<if test="spare29 != null">spare29,</if>
<if test="spare30 != null">spare30,</if>
<if test="spare31 != null">spare31,</if>
<if test="spare32 != null">spare32,</if>
<if test="spare33 != null">spare33,</if>
<if test="spare34 != null">spare34,</if>
<if test="spare35 != null">spare35,</if>
<if test="spare36 != null">spare36,</if>
<if test="spare37 != null">spare37,</if>
<if test="spare38 != null">spare38,</if>
<if test="spare39 != null">spare39,</if>
<if test="cargoSpaceName != null">cargo_space_name,</if>
<if test="roadwayId != null">roadway_id,</if>
<if test="cargoAreaId != null">cargo_area_id,</if>
@@ -205,7 +295,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lotNo != null">#{lotNo},</if>
<if test="inDate != null">#{inDate},</if>
<if test="backDate != null">#{backDate},</if>
<if test="productGuid != null">#{productGuid},</if>
<if test="quantity != null">#{quantity},</if>
<if test="jobId != null">#{jobId},</if>
<if test="trayCode != null">#{trayCode},</if>
@@ -216,29 +305,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inClassId != null">#{inClassId},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="stackingId != null">#{stackingId},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productId != null">#{productId},</if>
<if test="warehouseName != null">#{warehouseName},</if>
<if test="address != null">#{address},</if>
<if test="cDesc != null">#{cDesc},</if>
<if test="warehouseKind != null">#{warehouseKind},</if>
<if test="warehouseType != null">#{warehouseType},</if>
<if test="isCurrent != null">#{isCurrent},</if>
<if test="productGuid != null">#{productGuid},</if>
<if test="productId != null">#{productId},</if>
<if test="parentId != null">#{parentId},</if>
<if test="price != null">#{price},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="spec != null">#{spec},</if>
<if test="enName != null">#{enName},</if>
<if test="weight != null">#{weight},</if>
<if test="longMM != null">#{longMM},</if>
<if test="wide != null">#{wide},</if>
<if test="hight != null">#{hight},</if>
<if test="volume != null">#{volume},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productName != null">#{productName},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spare10 != null">#{spare10},</if>
<if test="spare11 != null">#{spare11},</if>
<if test="spare12 != null">#{spare12},</if>
<if test="spare13 != null">#{spare13},</if>
<if test="spare14 != null">#{spare14},</if>
<if test="spare15 != null">#{spare15},</if>
<if test="spare16 != null">#{spare16},</if>
<if test="spare17 != null">#{spare17},</if>
<if test="spare18 != null">#{spare18},</if>
<if test="spare19 != null">#{spare19},</if>
<if test="spare20 != null">#{spare20},</if>
<if test="spare21 != null">#{spare21},</if>
<if test="spare22 != null">#{spare22},</if>
<if test="spare23 != null">#{spare23},</if>
<if test="spare24 != null">#{spare24},</if>
<if test="spare25 != null">#{spare25},</if>
<if test="spare26 != null">#{spare26},</if>
<if test="spare27 != null">#{spare27},</if>
<if test="spare28 != null">#{spare28},</if>
<if test="spare29 != null">#{spare29},</if>
<if test="spare30 != null">#{spare30},</if>
<if test="spare31 != null">#{spare31},</if>
<if test="spare32 != null">#{spare32},</if>
<if test="spare33 != null">#{spare33},</if>
<if test="spare34 != null">#{spare34},</if>
<if test="spare35 != null">#{spare35},</if>
<if test="spare36 != null">#{spare36},</if>
<if test="spare37 != null">#{spare37},</if>
<if test="spare38 != null">#{spare38},</if>
<if test="spare39 != null">#{spare39},</if>
<if test="cargoSpaceName != null">#{cargoSpaceName},</if>
<if test="roadwayId != null">#{roadwayId},</if>
<if test="cargoAreaId != null">#{cargoAreaId},</if>
@@ -267,7 +387,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="inDate != null">in_date = #{inDate},</if>
<if test="backDate != null">back_date = #{backDate},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="jobId != null">job_id = #{jobId},</if>
<if test="trayCode != null">tray_code = #{trayCode},</if>
@@ -278,29 +397,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inClassId != null">in_class_id = #{inClassId},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="stackingId != null">stacking_id = #{stackingId},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
<if test="address != null">address = #{address},</if>
<if test="cDesc != null">c_desc = #{cDesc},</if>
<if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
<if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
<if test="isCurrent != null">is_current = #{isCurrent},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="price != null">price = #{price},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="enName != null">enName = #{enName},</if>
<if test="weight != null">weight = #{weight},</if>
<if test="longMM != null">longMM = #{longMM},</if>
<if test="wide != null">wide = #{wide},</if>
<if test="hight != null">hight = #{hight},</if>
<if test="volume != null">volume = #{volume},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="spare10 != null">spare10 = #{spare10},</if>
<if test="spare11 != null">spare11 = #{spare11},</if>
<if test="spare12 != null">spare12 = #{spare12},</if>
<if test="spare13 != null">spare13 = #{spare13},</if>
<if test="spare14 != null">spare14 = #{spare14},</if>
<if test="spare15 != null">spare15 = #{spare15},</if>
<if test="spare16 != null">spare16 = #{spare16},</if>
<if test="spare17 != null">spare17 = #{spare17},</if>
<if test="spare18 != null">spare18 = #{spare18},</if>
<if test="spare19 != null">spare19 = #{spare19},</if>
<if test="spare20 != null">spare20 = #{spare20},</if>
<if test="spare21 != null">spare21 = #{spare21},</if>
<if test="spare22 != null">spare22 = #{spare22},</if>
<if test="spare23 != null">spare23 = #{spare23},</if>
<if test="spare24 != null">spare24 = #{spare24},</if>
<if test="spare25 != null">spare25 = #{spare25},</if>
<if test="spare26 != null">spare26 = #{spare26},</if>
<if test="spare27 != null">spare27 = #{spare27},</if>
<if test="spare28 != null">spare28 = #{spare28},</if>
<if test="spare29 != null">spare29 = #{spare29},</if>
<if test="spare30 != null">spare30 = #{spare30},</if>
<if test="spare31 != null">spare31 = #{spare31},</if>
<if test="spare32 != null">spare32 = #{spare32},</if>
<if test="spare33 != null">spare33 = #{spare33},</if>
<if test="spare34 != null">spare34 = #{spare34},</if>
<if test="spare35 != null">spare35 = #{spare35},</if>
<if test="spare36 != null">spare36 = #{spare36},</if>
<if test="spare37 != null">spare37 = #{spare37},</if>
<if test="spare38 != null">spare38 = #{spare38},</if>
<if test="spare39 != null">spare39 = #{spare39},</if>
<if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
<if test="roadwayId != null">roadway_id = #{roadwayId},</if>
<if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>

360
ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml
View File

@@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="lotNo" column="lot_no" />
<result property="inDate" column="in_date" />
<result property="backDate" column="back_date" />
<result property="productGuid" column="product_guid" />
<result property="quantity" column="quantity" />
<result property="jobId" column="job_id" />
<result property="trayCode" column="tray_code" />
@@ -23,29 +22,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inClassId" column="in_class_id" />
<result property="warehouseId" column="warehouse_id" />
<result property="stackingId" column="stacking_id" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productId" column="product_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="address" column="address" />
<result property="cDesc" column="c_desc" />
<result property="warehouseKind" column="warehouse_kind" />
<result property="warehouseType" column="warehouse_type" />
<result property="isCurrent" column="is_current" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="parentId" column="parent_id" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="enName" column="enName" />
<result property="weight" column="weight" />
<result property="longMM" column="longMM" />
<result property="wide" column="wide" />
<result property="hight" column="hight" />
<result property="volume" column="volume" />
<result property="remark" column="remark" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productName" column="product_name" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="spare10" column="spare10" />
<result property="spare11" column="spare11" />
<result property="spare12" column="spare12" />
<result property="spare13" column="spare13" />
<result property="spare14" column="spare14" />
<result property="spare15" column="spare15" />
<result property="spare16" column="spare16" />
<result property="spare17" column="spare17" />
<result property="spare18" column="spare18" />
<result property="spare19" column="spare19" />
<result property="spare20" column="spare20" />
<result property="spare21" column="spare21" />
<result property="spare22" column="spare22" />
<result property="spare23" column="spare23" />
<result property="spare24" column="spare24" />
<result property="spare25" column="spare25" />
<result property="spare26" column="spare26" />
<result property="spare27" column="spare27" />
<result property="spare28" column="spare28" />
<result property="spare29" column="spare29" />
<result property="spare30" column="spare30" />
<result property="spare31" column="spare31" />
<result property="spare32" column="spare32" />
<result property="spare33" column="spare33" />
<result property="spare34" column="spare34" />
<result property="spare35" column="spare35" />
<result property="spare36" column="spare36" />
<result property="spare37" column="spare37" />
<result property="spare38" column="spare38" />
<result property="spare39" column="spare39" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="roadwayId" column="roadway_id" />
<result property="cargoAreaId" column="cargo_area_id" />
@@ -65,69 +95,99 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectViewStockWarningVo">
select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, price, unit, spec, enName, weight, longMM, wide, hight, volume, product_name, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_warning
select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, 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, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_warning
</sql>
<select id="selectViewStockWarningList" parameterType="ViewStockWarning" resultMap="ViewStockWarningResult">
<include refid="selectViewStockWarningVo"/>
<where>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
<if test="stockId != null and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="productStatus != null and productStatus != ''"> and product_status = #{productStatus}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and in_date = #{inDate}</if>
<if test="backDate != null and backDate != ''"> and back_date = #{backDate}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
<if test="outQuantity != null and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="inDate != null and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
<if test="backDate != null and backDate != ''"> and back_date like concat('%', #{backDate}, '%')</if>
<if test="quantity != null and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
<if test="jobId != null and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
<if test="outQuantity != null and outQuantity != ''"> and out_quantity like concat('%', #{outQuantity}, '%')</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<if test="inClassId != null and inClassId != ''"> and in_class_id = #{inClassId}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id = #{stackingId}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="inClassId != null and inClassId != ''"> and in_class_id like concat('%', #{inClassId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
<if test="warehouseName != null and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="address != null and address != ''"> and address = #{address}</if>
<if test="cDesc != null and cDesc != ''"> and c_desc = #{cDesc}</if>
<if test="warehouseKind != null and warehouseKind != ''"> and warehouse_kind = #{warehouseKind}</if>
<if test="warehouseType != null and warehouseType != ''"> and warehouse_type = #{warehouseType}</if>
<if test="isCurrent != null and isCurrent != ''"> and is_current = #{isCurrent}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="enName != null and enName != ''"> and enName like concat('%', #{enName}, '%')</if>
<if test="weight != null and weight != ''"> and weight = #{weight}</if>
<if test="longMM != null and longMM != ''"> and longMM = #{longMM}</if>
<if test="wide != null and wide != ''"> and wide = #{wide}</if>
<if test="hight != null and hight != ''"> and hight = #{hight}</if>
<if test="volume != null and volume != ''"> and volume = #{volume}</if>
<if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if>
<if test="cDesc != null and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
<if test="warehouseKind != null and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
<if test="warehouseType != null and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
<if test="isCurrent != null and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="parentId != null and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare9 != null and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
<if test="spare10 != null and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
<if test="spare11 != null and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
<if test="spare12 != null and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
<if test="spare13 != null and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
<if test="spare14 != null and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
<if test="spare15 != null and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
<if test="spare16 != null and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
<if test="spare17 != null and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
<if test="spare18 != null and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
<if test="spare19 != null and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
<if test="spare20 != null and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
<if test="spare21 != null and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
<if test="spare22 != null and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
<if test="spare23 != null and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
<if test="spare24 != null and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
<if test="spare25 != null and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
<if test="spare26 != null and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
<if test="spare27 != null and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
<if test="spare28 != null and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
<if test="spare29 != null and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
<if test="spare30 != null and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
<if test="spare31 != null and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
<if test="spare32 != null and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
<if test="spare33 != null and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
<if test="spare34 != null and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
<if test="spare35 != null and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
<if test="spare36 != null and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
<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="cargoSpaceName != null and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
<if test="cargoAreaId != null and cargoAreaId != ''"> and cargo_area_id = #{cargoAreaId}</if>
<if test="theType != null and theType != ''"> and the_type = #{theType}</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="cargoAreaId != null and cargoAreaId != ''"> and cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
<if test="theType != null and theType != ''"> and the_type like concat('%', #{theType}, '%')</if>
<if test="theTypeName != null and theTypeName != ''"> and the_type_name like concat('%', #{theTypeName}, '%')</if>
<if test="thePlatoon != null "> and the_platoon = #{thePlatoon}</if>
<if test="theColumn != null "> and the_column = #{theColumn}</if>
<if test="theFloor != null "> and the_floor = #{theFloor}</if>
<if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
<if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
<if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
<if test="cargoStatus != null and cargoStatus != ''"> and cargo_status = #{cargoStatus}</if>
<if test="locked != null and locked != ''"> and locked = #{locked}</if>
<if test="cargoHight != null and cargoHight != ''"> and cargo_hight = #{cargoHight}</if>
<if test="issDouble != null and issDouble != ''"> and iss_double = #{issDouble}</if>
<if test="groupCodingNo != null and groupCodingNo != ''"> and group_coding_no = #{groupCodingNo}</if>
<if test="groupCoding != null and groupCoding != ''"> and group_coding = #{groupCoding}</if>
<if test="cargoSpaceLogo != null and cargoSpaceLogo != ''"> and cargo_space_logo = #{cargoSpaceLogo}</if>
<if test="thisCargoArea != null and thisCargoArea != ''"> and this_cargo_area = #{thisCargoArea}</if>
<if test="cargoHight != null and cargoHight != ''"> and cargo_hight like concat('%', #{cargoHight}, '%')</if>
<if test="issDouble != null and issDouble != ''"> and iss_double like concat('%', #{issDouble}, '%')</if>
<if test="groupCodingNo != null and groupCodingNo != ''"> and group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
<if test="groupCoding != null and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
<if test="cargoSpaceLogo != null and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
<if test="thisCargoArea != null and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
</where>
</select>
@@ -146,7 +206,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lotNo != null">lot_no,</if>
<if test="inDate != null">in_date,</if>
<if test="backDate != null">back_date,</if>
<if test="productGuid != null">product_guid,</if>
<if test="quantity != null">quantity,</if>
<if test="jobId != null">job_id,</if>
<if test="trayCode != null">tray_code,</if>
@@ -157,29 +216,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inClassId != null">in_class_id,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="stackingId != null">stacking_id,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productId != null">product_id,</if>
<if test="warehouseName != null">warehouse_name,</if>
<if test="address != null">address,</if>
<if test="cDesc != null">c_desc,</if>
<if test="warehouseKind != null">warehouse_kind,</if>
<if test="warehouseType != null">warehouse_type,</if>
<if test="isCurrent != null">is_current,</if>
<if test="productGuid != null">product_guid,</if>
<if test="productId != null">product_id,</if>
<if test="parentId != null">parent_id,</if>
<if test="price != null">price,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="spec != null">spec,</if>
<if test="enName != null">enName,</if>
<if test="weight != null">weight,</if>
<if test="longMM != null">longMM,</if>
<if test="wide != null">wide,</if>
<if test="hight != null">hight,</if>
<if test="volume != null">volume,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productName != null">product_name,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spare10 != null">spare10,</if>
<if test="spare11 != null">spare11,</if>
<if test="spare12 != null">spare12,</if>
<if test="spare13 != null">spare13,</if>
<if test="spare14 != null">spare14,</if>
<if test="spare15 != null">spare15,</if>
<if test="spare16 != null">spare16,</if>
<if test="spare17 != null">spare17,</if>
<if test="spare18 != null">spare18,</if>
<if test="spare19 != null">spare19,</if>
<if test="spare20 != null">spare20,</if>
<if test="spare21 != null">spare21,</if>
<if test="spare22 != null">spare22,</if>
<if test="spare23 != null">spare23,</if>
<if test="spare24 != null">spare24,</if>
<if test="spare25 != null">spare25,</if>
<if test="spare26 != null">spare26,</if>
<if test="spare27 != null">spare27,</if>
<if test="spare28 != null">spare28,</if>
<if test="spare29 != null">spare29,</if>
<if test="spare30 != null">spare30,</if>
<if test="spare31 != null">spare31,</if>
<if test="spare32 != null">spare32,</if>
<if test="spare33 != null">spare33,</if>
<if test="spare34 != null">spare34,</if>
<if test="spare35 != null">spare35,</if>
<if test="spare36 != null">spare36,</if>
<if test="spare37 != null">spare37,</if>
<if test="spare38 != null">spare38,</if>
<if test="spare39 != null">spare39,</if>
<if test="cargoSpaceName != null">cargo_space_name,</if>
<if test="roadwayId != null">roadway_id,</if>
<if test="cargoAreaId != null">cargo_area_id,</if>
@@ -205,7 +295,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lotNo != null">#{lotNo},</if>
<if test="inDate != null">#{inDate},</if>
<if test="backDate != null">#{backDate},</if>
<if test="productGuid != null">#{productGuid},</if>
<if test="quantity != null">#{quantity},</if>
<if test="jobId != null">#{jobId},</if>
<if test="trayCode != null">#{trayCode},</if>
@@ -216,29 +305,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inClassId != null">#{inClassId},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="stackingId != null">#{stackingId},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productId != null">#{productId},</if>
<if test="warehouseName != null">#{warehouseName},</if>
<if test="address != null">#{address},</if>
<if test="cDesc != null">#{cDesc},</if>
<if test="warehouseKind != null">#{warehouseKind},</if>
<if test="warehouseType != null">#{warehouseType},</if>
<if test="isCurrent != null">#{isCurrent},</if>
<if test="productGuid != null">#{productGuid},</if>
<if test="productId != null">#{productId},</if>
<if test="parentId != null">#{parentId},</if>
<if test="price != null">#{price},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="spec != null">#{spec},</if>
<if test="enName != null">#{enName},</if>
<if test="weight != null">#{weight},</if>
<if test="longMM != null">#{longMM},</if>
<if test="wide != null">#{wide},</if>
<if test="hight != null">#{hight},</if>
<if test="volume != null">#{volume},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productName != null">#{productName},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spare10 != null">#{spare10},</if>
<if test="spare11 != null">#{spare11},</if>
<if test="spare12 != null">#{spare12},</if>
<if test="spare13 != null">#{spare13},</if>
<if test="spare14 != null">#{spare14},</if>
<if test="spare15 != null">#{spare15},</if>
<if test="spare16 != null">#{spare16},</if>
<if test="spare17 != null">#{spare17},</if>
<if test="spare18 != null">#{spare18},</if>
<if test="spare19 != null">#{spare19},</if>
<if test="spare20 != null">#{spare20},</if>
<if test="spare21 != null">#{spare21},</if>
<if test="spare22 != null">#{spare22},</if>
<if test="spare23 != null">#{spare23},</if>
<if test="spare24 != null">#{spare24},</if>
<if test="spare25 != null">#{spare25},</if>
<if test="spare26 != null">#{spare26},</if>
<if test="spare27 != null">#{spare27},</if>
<if test="spare28 != null">#{spare28},</if>
<if test="spare29 != null">#{spare29},</if>
<if test="spare30 != null">#{spare30},</if>
<if test="spare31 != null">#{spare31},</if>
<if test="spare32 != null">#{spare32},</if>
<if test="spare33 != null">#{spare33},</if>
<if test="spare34 != null">#{spare34},</if>
<if test="spare35 != null">#{spare35},</if>
<if test="spare36 != null">#{spare36},</if>
<if test="spare37 != null">#{spare37},</if>
<if test="spare38 != null">#{spare38},</if>
<if test="spare39 != null">#{spare39},</if>
<if test="cargoSpaceName != null">#{cargoSpaceName},</if>
<if test="roadwayId != null">#{roadwayId},</if>
<if test="cargoAreaId != null">#{cargoAreaId},</if>
@@ -267,7 +387,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="inDate != null">in_date = #{inDate},</if>
<if test="backDate != null">back_date = #{backDate},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="jobId != null">job_id = #{jobId},</if>
<if test="trayCode != null">tray_code = #{trayCode},</if>
@@ -278,29 +397,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inClassId != null">in_class_id = #{inClassId},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="stackingId != null">stacking_id = #{stackingId},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
<if test="address != null">address = #{address},</if>
<if test="cDesc != null">c_desc = #{cDesc},</if>
<if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
<if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
<if test="isCurrent != null">is_current = #{isCurrent},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="price != null">price = #{price},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="enName != null">enName = #{enName},</if>
<if test="weight != null">weight = #{weight},</if>
<if test="longMM != null">longMM = #{longMM},</if>
<if test="wide != null">wide = #{wide},</if>
<if test="hight != null">hight = #{hight},</if>
<if test="volume != null">volume = #{volume},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="spare10 != null">spare10 = #{spare10},</if>
<if test="spare11 != null">spare11 = #{spare11},</if>
<if test="spare12 != null">spare12 = #{spare12},</if>
<if test="spare13 != null">spare13 = #{spare13},</if>
<if test="spare14 != null">spare14 = #{spare14},</if>
<if test="spare15 != null">spare15 = #{spare15},</if>
<if test="spare16 != null">spare16 = #{spare16},</if>
<if test="spare17 != null">spare17 = #{spare17},</if>
<if test="spare18 != null">spare18 = #{spare18},</if>
<if test="spare19 != null">spare19 = #{spare19},</if>
<if test="spare20 != null">spare20 = #{spare20},</if>
<if test="spare21 != null">spare21 = #{spare21},</if>
<if test="spare22 != null">spare22 = #{spare22},</if>
<if test="spare23 != null">spare23 = #{spare23},</if>
<if test="spare24 != null">spare24 = #{spare24},</if>
<if test="spare25 != null">spare25 = #{spare25},</if>
<if test="spare26 != null">spare26 = #{spare26},</if>
<if test="spare27 != null">spare27 = #{spare27},</if>
<if test="spare28 != null">spare28 = #{spare28},</if>
<if test="spare29 != null">spare29 = #{spare29},</if>
<if test="spare30 != null">spare30 = #{spare30},</if>
<if test="spare31 != null">spare31 = #{spare31},</if>
<if test="spare32 != null">spare32 = #{spare32},</if>
<if test="spare33 != null">spare33 = #{spare33},</if>
<if test="spare34 != null">spare34 = #{spare34},</if>
<if test="spare35 != null">spare35 = #{spare35},</if>
<if test="spare36 != null">spare36 = #{spare36},</if>
<if test="spare37 != null">spare37 = #{spare37},</if>
<if test="spare38 != null">spare38 = #{spare38},</if>
<if test="spare39 != null">spare39 = #{spare39},</if>
<if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
<if test="roadwayId != null">roadway_id = #{roadwayId},</if>
<if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>

242
ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper">
<resultMap type="ViewStockinHistory" id="ViewStockinHistoryResult">
<result property="stockinGuid" column="stockin_guid" />
<result property="stockinId" column="stockin_id" />
@@ -36,27 +36,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="scanNumJ" column="scan_num_j" />
<result property="printDate" column="print_date" />
<result property="stockStatus" column="stock_status" />
<result property="price" column="price" />
<result property="remark" column="remark" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="parentId" column="parent_id" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="remark" column="remark" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productName" column="product_name" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="spare10" column="spare10" />
<result property="spare11" column="spare11" />
<result property="spare12" column="spare12" />
<result property="spare13" column="spare13" />
<result property="spare14" column="spare14" />
<result property="spare15" column="spare15" />
<result property="spare16" column="spare16" />
<result property="spare17" column="spare17" />
<result property="spare18" column="spare18" />
<result property="spare19" column="spare19" />
<result property="spare20" column="spare20" />
<result property="spare21" column="spare21" />
<result property="spare22" column="spare22" />
<result property="spare23" column="spare23" />
<result property="spare24" column="spare24" />
<result property="spare25" column="spare25" />
<result property="spare26" column="spare26" />
<result property="spare27" column="spare27" />
<result property="spare28" column="spare28" />
<result property="spare29" column="spare29" />
<result property="spare30" column="spare30" />
<result property="spare31" column="spare31" />
<result property="spare32" column="spare32" />
<result property="spare33" column="spare33" />
<result property="spare34" column="spare34" />
<result property="spare35" column="spare35" />
<result property="spare36" column="spare36" />
<result property="spare37" column="spare37" />
<result property="spare38" column="spare38" />
<result property="spare39" column="spare39" />
<result property="warehouseName" column="warehouse_name" />
</resultMap>
<sql id="selectViewStockinHistoryVo">
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, price, remark, product_id, product_name, unit, spec, spare1,spare2,spare5,spare6,spare7,spare8 from view_stockin_history vsh
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, 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, warehouse_name from view_stockin_history
</sql>
<select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
<include refid="selectViewStockinHistoryVo"/>
<where>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
@@ -80,32 +117,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="quantity != null and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j like concat('%', #{scanNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="parentId != null and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
<if test="spare9 != null and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
<if test="spare10 != null and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
<if test="spare11 != null and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
<if test="spare12 != null and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
<if test="spare13 != null and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
<if test="spare14 != null and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
<if test="spare15 != null and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
<if test="spare16 != null and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
<if test="spare17 != null and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
<if test="spare18 != null and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
<if test="spare19 != null and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
<if test="spare20 != null and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
<if test="spare21 != null and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
<if test="spare22 != null and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
<if test="spare23 != null and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
<if test="spare24 != null and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
<if test="spare25 != null and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
<if test="spare26 != null and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
<if test="spare27 != null and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
<if test="spare28 != null and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
<if test="spare29 != null and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
<if test="spare30 != null and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
<if test="spare31 != null and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
<if test="spare32 != null and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
<if test="spare33 != null and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
<if test="spare34 != null and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
<if test="spare35 != null and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
<if test="spare36 != null and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
<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="warehouseName != null and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
</where>
</select>
<select id="selectViewStockinHistoryByStockinGuid" parameterType="String" resultMap="ViewStockinHistoryResult">
<include refid="selectViewStockinHistoryVo"/>
where stockin_guid = #{stockinGuid}
@@ -145,18 +216,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scanNumJ != null">scan_num_j,</if>
<if test="printDate != null">print_date,</if>
<if test="stockStatus != null">stock_status,</if>
<if test="price != null">price,</if>
<if test="remark != null">remark,</if>
<if test="productGuid != null">product_guid,</if>
<if test="productId != null">product_id,</if>
<if test="productName != null">product_name,</if>
<if test="parentId != null">parent_id,</if>
<if test="price != null">price,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="spec != null">spec,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productName != null">product_name,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spare10 != null">spare10,</if>
<if test="spare11 != null">spare11,</if>
<if test="spare12 != null">spare12,</if>
<if test="spare13 != null">spare13,</if>
<if test="spare14 != null">spare14,</if>
<if test="spare15 != null">spare15,</if>
<if test="spare16 != null">spare16,</if>
<if test="spare17 != null">spare17,</if>
<if test="spare18 != null">spare18,</if>
<if test="spare19 != null">spare19,</if>
<if test="spare20 != null">spare20,</if>
<if test="spare21 != null">spare21,</if>
<if test="spare22 != null">spare22,</if>
<if test="spare23 != null">spare23,</if>
<if test="spare24 != null">spare24,</if>
<if test="spare25 != null">spare25,</if>
<if test="spare26 != null">spare26,</if>
<if test="spare27 != null">spare27,</if>
<if test="spare28 != null">spare28,</if>
<if test="spare29 != null">spare29,</if>
<if test="spare30 != null">spare30,</if>
<if test="spare31 != null">spare31,</if>
<if test="spare32 != null">spare32,</if>
<if test="spare33 != null">spare33,</if>
<if test="spare34 != null">spare34,</if>
<if test="spare35 != null">spare35,</if>
<if test="spare36 != null">spare36,</if>
<if test="spare37 != null">spare37,</if>
<if test="spare38 != null">spare38,</if>
<if test="spare39 != null">spare39,</if>
<if test="warehouseName != null">warehouse_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
@@ -190,18 +298,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scanNumJ != null">#{scanNumJ},</if>
<if test="printDate != null">#{printDate},</if>
<if test="stockStatus != null">#{stockStatus},</if>
<if test="price != null">#{price},</if>
<if test="remark != null">#{remark},</if>
<if test="productGuid != null">#{productGuid},</if>
<if test="productId != null">#{productId},</if>
<if test="productName != null">#{productName},</if>
<if test="parentId != null">#{parentId},</if>
<if test="price != null">#{price},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="spec != null">#{spec},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productName != null">#{productName},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spare10 != null">#{spare10},</if>
<if test="spare11 != null">#{spare11},</if>
<if test="spare12 != null">#{spare12},</if>
<if test="spare13 != null">#{spare13},</if>
<if test="spare14 != null">#{spare14},</if>
<if test="spare15 != null">#{spare15},</if>
<if test="spare16 != null">#{spare16},</if>
<if test="spare17 != null">#{spare17},</if>
<if test="spare18 != null">#{spare18},</if>
<if test="spare19 != null">#{spare19},</if>
<if test="spare20 != null">#{spare20},</if>
<if test="spare21 != null">#{spare21},</if>
<if test="spare22 != null">#{spare22},</if>
<if test="spare23 != null">#{spare23},</if>
<if test="spare24 != null">#{spare24},</if>
<if test="spare25 != null">#{spare25},</if>
<if test="spare26 != null">#{spare26},</if>
<if test="spare27 != null">#{spare27},</if>
<if test="spare28 != null">#{spare28},</if>
<if test="spare29 != null">#{spare29},</if>
<if test="spare30 != null">#{spare30},</if>
<if test="spare31 != null">#{spare31},</if>
<if test="spare32 != null">#{spare32},</if>
<if test="spare33 != null">#{spare33},</if>
<if test="spare34 != null">#{spare34},</if>
<if test="spare35 != null">#{spare35},</if>
<if test="spare36 != null">#{spare36},</if>
<if test="spare37 != null">#{spare37},</if>
<if test="spare38 != null">#{spare38},</if>
<if test="spare39 != null">#{spare39},</if>
<if test="warehouseName != null">#{warehouseName},</if>
</trim>
</insert>
@@ -238,18 +383,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
<if test="printDate != null">print_date = #{printDate},</if>
<if test="stockStatus != null">stock_status = #{stockStatus},</if>
<if test="price != null">price = #{price},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="price != null">price = #{price},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="spare10 != null">spare10 = #{spare10},</if>
<if test="spare11 != null">spare11 = #{spare11},</if>
<if test="spare12 != null">spare12 = #{spare12},</if>
<if test="spare13 != null">spare13 = #{spare13},</if>
<if test="spare14 != null">spare14 = #{spare14},</if>
<if test="spare15 != null">spare15 = #{spare15},</if>
<if test="spare16 != null">spare16 = #{spare16},</if>
<if test="spare17 != null">spare17 = #{spare17},</if>
<if test="spare18 != null">spare18 = #{spare18},</if>
<if test="spare19 != null">spare19 = #{spare19},</if>
<if test="spare20 != null">spare20 = #{spare20},</if>
<if test="spare21 != null">spare21 = #{spare21},</if>
<if test="spare22 != null">spare22 = #{spare22},</if>
<if test="spare23 != null">spare23 = #{spare23},</if>
<if test="spare24 != null">spare24 = #{spare24},</if>
<if test="spare25 != null">spare25 = #{spare25},</if>
<if test="spare26 != null">spare26 = #{spare26},</if>
<if test="spare27 != null">spare27 = #{spare27},</if>
<if test="spare28 != null">spare28 = #{spare28},</if>
<if test="spare29 != null">spare29 = #{spare29},</if>
<if test="spare30 != null">spare30 = #{spare30},</if>
<if test="spare31 != null">spare31 = #{spare31},</if>
<if test="spare32 != null">spare32 = #{spare32},</if>
<if test="spare33 != null">spare33 = #{spare33},</if>
<if test="spare34 != null">spare34 = #{spare34},</if>
<if test="spare35 != null">spare35 = #{spare35},</if>
<if test="spare36 != null">spare36 = #{spare36},</if>
<if test="spare37 != null">spare37 = #{spare37},</if>
<if test="spare38 != null">spare38 = #{spare38},</if>
<if test="spare39 != null">spare39 = #{spare39},</if>
<if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
</trim>
where stockin_guid = #{stockinGuid}
</update>
@@ -259,9 +441,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteViewStockinHistoryByStockinGuids" parameterType="String">
delete from view_stockin_history where stockin_guid in
delete from view_stockin_history where stockin_guid in
<foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
#{stockinGuid}
</foreach>
</delete>
</mapper>
</mapper>

269
ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
View File

@@ -3,19 +3,17 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper">
<resultMap type="ViewStockoutHistory" id="ViewStockoutHistoryResult">
<result property="stockoutId" column="stockout_id" />
<result property="warehouseId" column="warehouse_id" />
<result property="outType" column="out_type" />
<result property="createDate" column="create_date" />
<result property="createManId" column="create_man_id" />
<result property="status" column="status" />
<result property="stockoutSource" column="stockout_source" />
<result property="exitId" column="exit_id" />
<result property="warehouseId" column="warehouse_id" />
<result property="stockoutDetailId" column="stockout_detail_id" />
<result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="lotNo" column="lot_no" />
<result property="quantity" column="quantity" />
<result property="allotQuantity" column="allot_quantity" />
@@ -23,36 +21,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="erpStockoutId" column="erp_stockout_id" />
<result property="entryid" column="entryid" />
<result property="customerName" column="customer_name" />
<result property="spec" column="spec" />
<result property="unit" column="unit" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="parentId" column="parent_id" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="remark" column="remark" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productName" column="product_name" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
<result property="spare9" column="spare9" />
<result property="spare10" column="spare10" />
<result property="spare11" column="spare11" />
<result property="spare12" column="spare12" />
<result property="spare13" column="spare13" />
<result property="spare14" column="spare14" />
<result property="spare15" column="spare15" />
<result property="spare16" column="spare16" />
<result property="spare17" column="spare17" />
<result property="spare18" column="spare18" />
<result property="spare19" column="spare19" />
<result property="spare20" column="spare20" />
<result property="spare21" column="spare21" />
<result property="spare22" column="spare22" />
<result property="spare23" column="spare23" />
<result property="spare24" column="spare24" />
<result property="spare25" column="spare25" />
<result property="spare26" column="spare26" />
<result property="spare27" column="spare27" />
<result property="spare28" column="spare28" />
<result property="spare29" column="spare29" />
<result property="spare30" column="spare30" />
<result property="spare31" column="spare31" />
<result property="spare32" column="spare32" />
<result property="spare33" column="spare33" />
<result property="spare34" column="spare34" />
<result property="spare35" column="spare35" />
<result property="spare36" column="spare36" />
<result property="spare37" column="spare37" />
<result property="spare38" column="spare38" />
<result property="spare39" column="spare39" />
</resultMap>
<sql id="selectViewStockoutHistoryVo">
select stockout_id,warehouse_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_stockout_history vsh
select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, warehouse_id, stockout_detail_id, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, 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_stockout_history
</sql>
<select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
<include refid="selectViewStockoutHistoryVo"/>
<where>
<where>
<if test="stockoutId != null and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="outType != null and outType != ''"> and out_type = #{outType}</if>
<if test="createDate != null and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="stockoutSource != null and stockoutSource != ''"> and stockout_source like concat('%', #{stockoutSource}, '%')</if>
<if test="exitId != null and exitId != ''"> and exit_id like concat('%', #{exitId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="stockoutDetailId != null and stockoutDetailId != ''"> and stockout_detail_id like concat('%', #{stockoutDetailId}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="quantity != null "> and quantity like concat('%', #{quantity}, '%')</if>
<if test="allotQuantity != null "> and allot_quantity like concat('%', #{allotQuantity}, '%')</if>
@@ -60,21 +94,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="erpStockoutId != null and erpStockoutId != ''"> and erp_stockout_id like concat('%', #{erpStockoutId}, '%')</if>
<if test="entryid != null and entryid != ''"> and entryid like concat('%', #{entryid}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="parentId != null and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
<if test="spare9 != null and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
<if test="spare10 != null and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
<if test="spare11 != null and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
<if test="spare12 != null and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
<if test="spare13 != null and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
<if test="spare14 != null and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
<if test="spare15 != null and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
<if test="spare16 != null and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
<if test="spare17 != null and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
<if test="spare18 != null and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
<if test="spare19 != null and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
<if test="spare20 != null and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
<if test="spare21 != null and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
<if test="spare22 != null and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
<if test="spare23 != null and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
<if test="spare24 != null and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
<if test="spare25 != null and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
<if test="spare26 != null and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
<if test="spare27 != null and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
<if test="spare28 != null and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
<if test="spare29 != null and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
<if test="spare30 != null and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
<if test="spare31 != null and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
<if test="spare32 != null and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
<if test="spare33 != null and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
<if test="spare34 != null and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
<if test="spare35 != null and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
<if test="spare36 != null and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
<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>
</where>
</select>
<select id="selectViewStockoutHistoryByStockoutId" parameterType="String" resultMap="ViewStockoutHistoryResult">
<include refid="selectViewStockoutHistoryVo"/>
where stockout_id = #{stockoutId}
@@ -84,15 +154,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into view_stockout_history
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
<if test="outType != null">out_type,</if>
<if test="createDate != null">create_date,</if>
<if test="outType != null and outType != ''">out_type,</if>
<if test="createDate != null and createDate != ''">create_date,</if>
<if test="createManId != null">create_man_id,</if>
<if test="status != null">status,</if>
<if test="status != null and status != ''">status,</if>
<if test="stockoutSource != null">stockout_source,</if>
<if test="exitId != null">exit_id,</if>
<if test="stockoutDetailId != null">stockout_detail_id,</if>
<if test="productId != null">product_id,</if>
<if test="productName != null">product_name,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
<if test="lotNo != null">lot_no,</if>
<if test="quantity != null">quantity,</if>
<if test="allotQuantity != null">allot_quantity,</if>
@@ -100,28 +169,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="erpStockoutId != null">erp_stockout_id,</if>
<if test="entryid != null">entryid,</if>
<if test="customerName != null">customer_name,</if>
<if test="spec != null">spec,</if>
<if test="unit != null">unit,</if>
<if test="productGuid != null">product_guid,</if>
<if test="productId != null">product_id,</if>
<if test="parentId != null">parent_id,</if>
<if test="price != null">price,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="spec != null">spec,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productName != null">product_name,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spare10 != null">spare10,</if>
<if test="spare11 != null">spare11,</if>
<if test="spare12 != null">spare12,</if>
<if test="spare13 != null">spare13,</if>
<if test="spare14 != null">spare14,</if>
<if test="spare15 != null">spare15,</if>
<if test="spare16 != null">spare16,</if>
<if test="spare17 != null">spare17,</if>
<if test="spare18 != null">spare18,</if>
<if test="spare19 != null">spare19,</if>
<if test="spare20 != null">spare20,</if>
<if test="spare21 != null">spare21,</if>
<if test="spare22 != null">spare22,</if>
<if test="spare23 != null">spare23,</if>
<if test="spare24 != null">spare24,</if>
<if test="spare25 != null">spare25,</if>
<if test="spare26 != null">spare26,</if>
<if test="spare27 != null">spare27,</if>
<if test="spare28 != null">spare28,</if>
<if test="spare29 != null">spare29,</if>
<if test="spare30 != null">spare30,</if>
<if test="spare31 != null">spare31,</if>
<if test="spare32 != null">spare32,</if>
<if test="spare33 != null">spare33,</if>
<if test="spare34 != null">spare34,</if>
<if test="spare35 != null">spare35,</if>
<if test="spare36 != null">spare36,</if>
<if test="spare37 != null">spare37,</if>
<if test="spare38 != null">spare38,</if>
<if test="spare39 != null">spare39,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
<if test="outType != null">#{outType},</if>
<if test="createDate != null">#{createDate},</if>
<if test="outType != null and outType != ''">#{outType},</if>
<if test="createDate != null and createDate != ''">#{createDate},</if>
<if test="createManId != null">#{createManId},</if>
<if test="status != null">#{status},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="stockoutSource != null">#{stockoutSource},</if>
<if test="exitId != null">#{exitId},</if>
<if test="stockoutDetailId != null">#{stockoutDetailId},</if>
<if test="productId != null">#{productId},</if>
<if test="productName != null">#{productName},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
<if test="lotNo != null">#{lotNo},</if>
<if test="quantity != null">#{quantity},</if>
<if test="allotQuantity != null">#{allotQuantity},</if>
@@ -129,31 +235,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="erpStockoutId != null">#{erpStockoutId},</if>
<if test="entryid != null">#{entryid},</if>
<if test="customerName != null">#{customerName},</if>
<if test="spec != null">#{spec},</if>
<if test="unit != null">#{unit},</if>
<if test="productGuid != null">#{productGuid},</if>
<if test="productId != null">#{productId},</if>
<if test="parentId != null">#{parentId},</if>
<if test="price != null">#{price},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="spec != null">#{spec},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productName != null">#{productName},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spare10 != null">#{spare10},</if>
<if test="spare11 != null">#{spare11},</if>
<if test="spare12 != null">#{spare12},</if>
<if test="spare13 != null">#{spare13},</if>
<if test="spare14 != null">#{spare14},</if>
<if test="spare15 != null">#{spare15},</if>
<if test="spare16 != null">#{spare16},</if>
<if test="spare17 != null">#{spare17},</if>
<if test="spare18 != null">#{spare18},</if>
<if test="spare19 != null">#{spare19},</if>
<if test="spare20 != null">#{spare20},</if>
<if test="spare21 != null">#{spare21},</if>
<if test="spare22 != null">#{spare22},</if>
<if test="spare23 != null">#{spare23},</if>
<if test="spare24 != null">#{spare24},</if>
<if test="spare25 != null">#{spare25},</if>
<if test="spare26 != null">#{spare26},</if>
<if test="spare27 != null">#{spare27},</if>
<if test="spare28 != null">#{spare28},</if>
<if test="spare29 != null">#{spare29},</if>
<if test="spare30 != null">#{spare30},</if>
<if test="spare31 != null">#{spare31},</if>
<if test="spare32 != null">#{spare32},</if>
<if test="spare33 != null">#{spare33},</if>
<if test="spare34 != null">#{spare34},</if>
<if test="spare35 != null">#{spare35},</if>
<if test="spare36 != null">#{spare36},</if>
<if test="spare37 != null">#{spare37},</if>
<if test="spare38 != null">#{spare38},</if>
<if test="spare39 != null">#{spare39},</if>
</trim>
</insert>
<update id="updateViewStockoutHistory" parameterType="ViewStockoutHistory">
update view_stockout_history
<trim prefix="SET" suffixOverrides=",">
<if test="outType != null">out_type = #{outType},</if>
<if test="createDate != null">create_date = #{createDate},</if>
<if test="outType != null and outType != ''">out_type = #{outType},</if>
<if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
<if test="createManId != null">create_man_id = #{createManId},</if>
<if test="status != null">status = #{status},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
<if test="exitId != null">exit_id = #{exitId},</if>
<if test="stockoutDetailId != null">stockout_detail_id = #{stockoutDetailId},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id = #{stockoutDetailId},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
@@ -161,16 +304,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
<if test="entryid != null">entryid = #{entryid},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="price != null">price = #{price},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="spare10 != null">spare10 = #{spare10},</if>
<if test="spare11 != null">spare11 = #{spare11},</if>
<if test="spare12 != null">spare12 = #{spare12},</if>
<if test="spare13 != null">spare13 = #{spare13},</if>
<if test="spare14 != null">spare14 = #{spare14},</if>
<if test="spare15 != null">spare15 = #{spare15},</if>
<if test="spare16 != null">spare16 = #{spare16},</if>
<if test="spare17 != null">spare17 = #{spare17},</if>
<if test="spare18 != null">spare18 = #{spare18},</if>
<if test="spare19 != null">spare19 = #{spare19},</if>
<if test="spare20 != null">spare20 = #{spare20},</if>
<if test="spare21 != null">spare21 = #{spare21},</if>
<if test="spare22 != null">spare22 = #{spare22},</if>
<if test="spare23 != null">spare23 = #{spare23},</if>
<if test="spare24 != null">spare24 = #{spare24},</if>
<if test="spare25 != null">spare25 = #{spare25},</if>
<if test="spare26 != null">spare26 = #{spare26},</if>
<if test="spare27 != null">spare27 = #{spare27},</if>
<if test="spare28 != null">spare28 = #{spare28},</if>
<if test="spare29 != null">spare29 = #{spare29},</if>
<if test="spare30 != null">spare30 = #{spare30},</if>
<if test="spare31 != null">spare31 = #{spare31},</if>
<if test="spare32 != null">spare32 = #{spare32},</if>
<if test="spare33 != null">spare33 = #{spare33},</if>
<if test="spare34 != null">spare34 = #{spare34},</if>
<if test="spare35 != null">spare35 = #{spare35},</if>
<if test="spare36 != null">spare36 = #{spare36},</if>
<if test="spare37 != null">spare37 = #{spare37},</if>
<if test="spare38 != null">spare38 = #{spare38},</if>
<if test="spare39 != null">spare39 = #{spare39},</if>
</trim>
where stockout_id = #{stockoutId}
</update>
@@ -180,9 +361,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteViewStockoutHistoryByStockoutIds" parameterType="String">
delete from view_stockout_history where stockout_id in
delete from view_stockout_history where stockout_id in
<foreach item="stockoutId" collection="array" open="(" separator="," close=")">
#{stockoutId}
</foreach>
</delete>
</mapper>
</mapper>

8
ruoyi-ui/src/api/search/ViewInJobFlow.js
View File

@@ -1,11 +1,5 @@
import request from '@/utils/request'
// 查询仓库列表
export function warehouseList() {
return request({
url: '/bas/warehouse/list',
method: 'get'
})
}
// 查询入库作业流水列表
export function listViewInJobFlow(query) {
return request({

10
ruoyi-ui/src/api/search/ViewOutJobFlow.js
View File

@@ -1,6 +1,6 @@
import request from '@/utils/request'
// 查询出库做业流水列表
// 查询出库作业流水列表
export function listViewOutJobFlow(query) {
return request({
url: '/search/ViewOutJobFlow/list',
@@ -9,7 +9,7 @@ export function listViewOutJobFlow(query) {
})
}
// 查询出库做业流水详细
// 查询出库作业流水详细
export function getViewOutJobFlow(jobId) {
return request({
url: '/search/ViewOutJobFlow/' + jobId,
@@ -17,7 +17,7 @@ export function getViewOutJobFlow(jobId) {
})
}
// 新增出库做业流水
// 新增出库作业流水
export function addViewOutJobFlow(data) {
return request({
url: '/search/ViewOutJobFlow',
@@ -26,7 +26,7 @@ export function addViewOutJobFlow(data) {
})
}
// 修改出库做业流水
// 修改出库作业流水
export function updateViewOutJobFlow(data) {
return request({
url: '/search/ViewOutJobFlow',
@@ -35,7 +35,7 @@ export function updateViewOutJobFlow(data) {
})
}
// 删除出库做业流水
// 删除出库作业流水
export function delViewOutJobFlow(jobId) {
return request({
url: '/search/ViewOutJobFlow/' + jobId,

10
ruoyi-ui/src/api/search/ViewStockWarning.js
View File

@@ -1,6 +1,6 @@
import request from '@/utils/request'
// 查询库存预警报表列表
// 查询库存预警查询列表
export function listViewStockWarning(query) {
return request({
url: '/search/ViewStockWarning/list',
@@ -9,7 +9,7 @@ export function listViewStockWarning(query) {
})
}
// 查询库存预警报表详细
// 查询库存预警查询详细
export function getViewStockWarning(stockId) {
return request({
url: '/search/ViewStockWarning/' + stockId,
@@ -17,7 +17,7 @@ export function getViewStockWarning(stockId) {
})
}
// 新增库存预警报表
// 新增库存预警查询
export function addViewStockWarning(data) {
return request({
url: '/search/ViewStockWarning',
@@ -26,7 +26,7 @@ export function addViewStockWarning(data) {
})
}
// 修改库存预警报表
// 修改库存预警查询
export function updateViewStockWarning(data) {
return request({
url: '/search/ViewStockWarning',
@@ -35,7 +35,7 @@ export function updateViewStockWarning(data) {
})
}
// 删除库存预警报表
// 删除库存预警查询
export function delViewStockWarning(stockId) {
return request({
url: '/search/ViewStockWarning/' + stockId,

282
ruoyi-ui/src/views/search/StockSummary/index.vue
View File

@@ -3,26 +3,60 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="分组选项">
<el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
<el-checkbox label="productId">物料编号(SKU)</el-checkbox>
<el-checkbox label="productName">物料名称</el-checkbox>
<!-- <el-checkbox label="spec">规格</el-checkbox>-->
<el-checkbox label="unit">单位</el-checkbox>
<!-- <el-checkbox label="lotNo">批号</el-checkbox>-->
<el-checkbox label="warehouseId">仓库名称</el-checkbox>
<!-- <el-checkbox label="roadwayId">巷道</el-checkbox>-->
<el-checkbox label="cargoSpaceId">货位号</el-checkbox>
<el-checkbox label="price">单价(元)</el-checkbox>
<el-checkbox label="spare1">英文名称</el-checkbox>
<el-checkbox label="spare2">单件净重(kg)</el-checkbox>
<el-checkbox label="spare5">长度(mm)</el-checkbox>
<el-checkbox label="spare6">宽度(mm)</el-checkbox>
<el-checkbox label="spare7">高度(mm)</el-checkbox>
<el-checkbox label="spare8">体积(m³)</el-checkbox>
<el-checkbox label="productId">品号</el-checkbox>
<el-checkbox label="productName">品名</el-checkbox>
<!-- <el-checkbox label="unit">单位</el-checkbox> -->
<!-- <el-checkbox label="warehouseId">仓库</el-checkbox> -->
<el-checkbox label="roadwayId">巷道</el-checkbox>
<el-checkbox label="cargoSpaceId">货位</el-checkbox>
<el-checkbox label="price">品号描述</el-checkbox>
<el-checkbox label="spec">规格</el-checkbox>
<!-- <el-checkbox label="parentId">产品分类</el-checkbox> -->
<el-checkbox label="cargoNo">英文描述</el-checkbox>
<!-- <el-checkbox label="spare1">型号</el-checkbox> -->
<el-checkbox label="spare2">单件净重</el-checkbox>
<!-- <el-checkbox label="spare3">颜色</el-checkbox> -->
<!-- <el-checkbox label="spare4">序列号</el-checkbox> -->
<!-- <el-checkbox label="spare5">电压</el-checkbox> -->
<!-- <el-checkbox label="spare6">功率</el-checkbox> -->
<!-- <el-checkbox label="spare7">相位</el-checkbox> -->
<!-- <el-checkbox label="spare8">毛重</el-checkbox> -->
<el-checkbox label="spare9">NC号</el-checkbox>
<el-checkbox label="spare10">电源线</el-checkbox>
<el-checkbox label="spare11">插头</el-checkbox>
<el-checkbox label="spare12">接嘴</el-checkbox>
<el-checkbox label="spare13">快捷码</el-checkbox>
<el-checkbox label="spare14">库存单位编号</el-checkbox>
<el-checkbox label="spare15">库存单位名称</el-checkbox>
<el-checkbox label="spare16">品号群组</el-checkbox>
<el-checkbox label="spare17">归类品</el-checkbox>
<el-checkbox label="spare18">计量体系</el-checkbox>
<el-checkbox label="spare19">群组名称</el-checkbox>
<el-checkbox label="spare20">批号管理</el-checkbox>
<el-checkbox label="spare21">状态</el-checkbox>
<el-checkbox label="spare22">产品大类</el-checkbox>
<el-checkbox label="spare23">产品二类</el-checkbox>
<el-checkbox label="spare24">产品线/产品系列</el-checkbox>
<el-checkbox label="spare25">BOM状态</el-checkbox>
<el-checkbox label="spare26">产品定位</el-checkbox>
<el-checkbox label="spare27">电脑板型号</el-checkbox>
<el-checkbox label="spare28">非标要求</el-checkbox>
<el-checkbox label="spare29">品牌</el-checkbox>
<el-checkbox label="spare30">非标颜色</el-checkbox>
<el-checkbox label="spare31">主颜色</el-checkbox>
<el-checkbox label="spare32">辅助颜色</el-checkbox>
<el-checkbox label="spare33">是否标准款</el-checkbox>
<el-checkbox label="spare34">包装方式</el-checkbox>
<el-checkbox label="spare35">主要包装方式</el-checkbox>
<el-checkbox label="spare36">长</el-checkbox>
<el-checkbox label="spare37">宽</el-checkbox>
<el-checkbox label="spare38">高</el-checkbox>
<el-checkbox label="spare39">包装材积</el-checkbox>
</el-checkbox-group>
</el-form-item>
<br>
<el-form-item label="仓库名称" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称" clearable>
<!-- <el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
@@ -30,11 +64,19 @@
:value="dict.warehouseId"
/>
</el-select>
</el-form-item> -->
<el-form-item label="巷道" prop="roadwayId">
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编号" prop="productId">
<el-form-item label="物料编码" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编号(SKU)"
placeholder="请输入物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -47,26 +89,18 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="规格" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.spec"-->
<!-- placeholder="请输入规格"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="批号" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.lotNo"-->
<!-- placeholder="请输入批号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="货位编号" prop="cargoSpaceId">
<el-form-item label="NC号" prop="spare9">
<el-input
v-model="queryParams.spare9"
placeholder="请输入NC号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位" prop="cargoSpaceId">
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位号"
placeholder="请输入货位"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -98,19 +132,54 @@
max-height="650"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料编号(SKU)" align="left" prop="productId" width="120" v-if="queryParams.groupFields.includes('productId')" />
<el-table-column label="物料名称" align="left" prop="productName" width="120" v-if="queryParams.groupFields.includes('productName')" />
<el-table-column label="单位" align="left" prop="unit" width="120" v-if="queryParams.groupFields.includes('unit')" />
<el-table-column label="仓库名称" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />
<el-table-column label="货位号" align="left" prop="cargoSpaceName" width="120" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
<el-table-column label="数量(件)" align="right" prop="quantity" width="120" />
<el-table-column label="英文名称" align="left" prop="spare1" width="120" v-if="queryParams.groupFields.includes('spare1')" />
<el-table-column label="单件净重(kg)" align="right" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" />
<el-table-column label="长度(mm)" align="right" prop="spare5" width="120" v-if="queryParams.groupFields.includes('spare5')" />
<el-table-column label="宽度(mm)" align="right" prop="spare6" width="120" v-if="queryParams.groupFields.includes('spare6')" />
<el-table-column label="高度(mm)" align="right" prop="spare7" width="120" v-if="queryParams.groupFields.includes('spare7')" />
<el-table-column label="体积(m³)" align="right" prop="spare8" width="120" v-if="queryParams.groupFields.includes('spare8')" />
<el-table-column label="单价(元)" align="right" prop="price" width="120" v-if="queryParams.groupFields.includes('price')" />
<el-table-column label="物料编码" align="left" prop="productId" width="120" v-if="queryParams.groupFields.includes('productId')" />
<el-table-column label="物料名称" align="center" prop="productName" width="120" v-if="queryParams.groupFields.includes('productName')" />
<!-- <el-table-column label="单位" align="center" prop="unit" width="120" v-if="queryParams.groupFields.includes('unit')" /> -->
<el-table-column label="仓库" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />
<el-table-column label="巷道" align="left" prop="roadwayId" width="120" />
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="120" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
<el-table-column label="库存数量" align="right" prop="quantity" width="120" />
<!-- <el-table-column label="型号" align="center" prop="spare1" width="120" v-if="queryParams.groupFields.includes('spare1')" /> -->
<!-- <el-table-column label="单件净重" align="center" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" /> -->
<!-- <el-table-column label="电压" align="center" prop="spare5" width="120" v-if="queryParams.groupFields.includes('spare5')" /> -->
<!-- <el-table-column label="功率" align="center" prop="spare6" width="120" v-if="queryParams.groupFields.includes('spare6')" /> -->
<!-- <el-table-column label="相位" align="center" prop="spare7" width="120" v-if="queryParams.groupFields.includes('spare7')" /> -->
<!-- <el-table-column label="毛重" align="center" prop="spare8" width="120" v-if="queryParams.groupFields.includes('spare8')" /> -->
<el-table-column label="规格" align="left" prop="spec" width="120" v-if="queryParams.groupFields.includes('spec')" />
<el-table-column label="品号描述" align="left" prop="price" width="120" v-if="queryParams.groupFields.includes('price')" />
<el-table-column label="产品分类" align="left" prop="parentId" width="120" v-if="queryParams.groupFields.includes('parentId')" />
<el-table-column label="英文描述" align="left" prop="cargoNo" width="120" v-if="queryParams.groupFields.includes('cargoNo')" />
<el-table-column label="NC号" align="left" prop="spare9" width="120" v-if="queryParams.groupFields.includes('spare9')" />
<el-table-column label="电源线" align="left" prop="spare10" width="120" v-if="queryParams.groupFields.includes('spare10')" />
<el-table-column label="插头" align="left" prop="spare11" width="120" v-if="queryParams.groupFields.includes('spare11')" />
<el-table-column label="接嘴" align="left" prop="spare12" width="120" v-if="queryParams.groupFields.includes('spare12')" />
<el-table-column label="快捷码" align="left" prop="spare13" width="120" v-if="queryParams.groupFields.includes('spare13')" />
<el-table-column label="库存单位编号" align="left" prop="spare14" width="120" v-if="queryParams.groupFields.includes('spare14')" />
<el-table-column label="库存单位名称" align="left" prop="spare15" width="120" v-if="queryParams.groupFields.includes('spare15')" />
<el-table-column label="品号群组" align="left" prop="spare16" width="120" v-if="queryParams.groupFields.includes('spare16')" />
<el-table-column label="归类品" align="left" prop="spare17" width="120" v-if="queryParams.groupFields.includes('spare17')" />
<el-table-column label="计量体系" align="left" prop="spare18" width="120" v-if="queryParams.groupFields.includes('spare18')" />
<el-table-column label="群组名称" align="left" prop="spare19" width="120" v-if="queryParams.groupFields.includes('spare19')" />
<el-table-column label="批号管理" align="left" prop="spare20" width="120" v-if="queryParams.groupFields.includes('spare20')" />
<el-table-column label="状态" align="left" prop="spare21" width="120" v-if="queryParams.groupFields.includes('spare21')" />
<el-table-column label="产品大类" align="left" prop="spare22" width="120" v-if="queryParams.groupFields.includes('spare22')" />
<el-table-column label="产品二类" align="left" prop="spare23" width="120" v-if="queryParams.groupFields.includes('spare23')" />
<el-table-column label="产品线/产品系列" align="left" prop="spare24" width="120" v-if="queryParams.groupFields.includes('spare24')" />
<el-table-column label="BOM状态" align="left" prop="spare25" width="120" v-if="queryParams.groupFields.includes('spare25')" />
<el-table-column label="产品定位" align="left" prop="spare26" width="120" v-if="queryParams.groupFields.includes('spare26')" />
<el-table-column label="电脑板型号" align="left" prop="spare27" width="120" v-if="queryParams.groupFields.includes('spare27')" />
<el-table-column label="非标要求" align="left" prop="spare28" width="120" v-if="queryParams.groupFields.includes('spare28')" />
<el-table-column label="品牌" align="left" prop="spare29" width="120" v-if="queryParams.groupFields.includes('spare29')" />
<el-table-column label="非标颜色" align="left" prop="spare30" width="120" v-if="queryParams.groupFields.includes('spare30')" />
<el-table-column label="主颜色" align="left" prop="spare31" width="120" v-if="queryParams.groupFields.includes('spare31')" />
<el-table-column label="辅助颜色" align="left" prop="spare32" width="120" v-if="queryParams.groupFields.includes('spare32')" />
<el-table-column label="是否标准款" align="left" prop="spare33" width="120" v-if="queryParams.groupFields.includes('spare33')" />
<el-table-column label="包装方式" align="left" prop="spare34" width="120" v-if="queryParams.groupFields.includes('spare34')" />
<el-table-column label="主要包装方式" align="left" prop="spare35" width="120" v-if="queryParams.groupFields.includes('spare35')" />
<el-table-column label="长" align="right" prop="spare36" width="120" v-if="queryParams.groupFields.includes('spare36')" />
<el-table-column label="宽" align="right" prop="spare37" width="120" v-if="queryParams.groupFields.includes('spare37')" />
<el-table-column label="高" align="right" prop="spare38" width="120" v-if="queryParams.groupFields.includes('spare38')" />
<el-table-column label="包装材积" align="center" prop="spare39" width="120" v-if="queryParams.groupFields.includes('spare39')" />
<el-table-column label="备注" align="left" prop="remark" width="120" />
</el-table>
@@ -133,8 +202,8 @@ export default {
data() {
return {
// 遮罩层
loading: true,
// 仓库选项
loading: false,
// 仓库选项列表
warehouseOptions: [],
// 选中数组
ids: [],
@@ -160,6 +229,45 @@ export default {
warehouseId: null,
roadwayId: null,
quantity: null,
parentId: null,
cargoNo: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null,
spare8: null,
spare9: null,
spare10: null,
spare11: null,
spare12: null,
spare13: null,
spare14: null,
spare15: null,
spare16: null,
spare17: null,
spare18: null,
spare19: null,
spare20: null,
spare21: null,
spare22: null,
spare23: null,
spare24: null,
spare25: null,
spare26: null,
spare27: null,
spare28: null,
spare29: null,
spare30: null,
spare31: null,
spare32: null,
spare33: null,
spare34: null,
spare35: null,
spare36: null,
spare37: null,
spare38: null,
spare39: null,
//分组字段
groupFields: []
}
@@ -168,6 +276,46 @@ export default {
created() {
// 初始化时全选分组选项
this.queryParams.groupFields = [
'parentId',
'cargoNo',
'roadwayId',
'spare3',
'spare4',
'spare5',
'spare6',
'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',
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
];
@@ -217,6 +365,36 @@ export default {
this.resetForm("queryForm");
// 重置时恢复全选状态
this.queryParams.groupFields = [
'parentId',
'cargoNo',
'roadwayId',
'spare3',
'spare4',
'spare5',
'spare6',
'spare7',
'spare8',
'spare9',
'spare10',
'spare11',
'spare12',
'spare13',
'spare14',
'spare15',
'spare16',
'spare17',
'spare18',
'spare19',
'spare20',
'spare21',
'spare22',
'spare23',
'spare24',
'spare25',
'spare26',
'spare27',
'spare28',
'spare29',
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
];

1065
ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
View File

File diff suppressed because it is too large Load Diff

1417
ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
View File

File diff suppressed because it is too large Load Diff

311
ruoyi-ui/src/views/search/ViewStockDetail/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="仓库名称" prop="warehouseId">
<!-- <el-form-item label="仓库名称" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称" clearable>
<el-option
v-for="dict in warehouseOptions"
@@ -10,183 +10,62 @@
:value="dict.warehouseId"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="id" prop="onlyIdentity">-->
<!-- <el-input-->
<!-- v-model="queryParams.onlyIdentity"-->
<!-- placeholder="请输入id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="库存号" prop="stockId">
</el-form-item> -->
<el-form-item label="库存ID" prop="stockId">
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存号"
placeholder="请输入库存ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库单号" prop="stockinDetailId" style="white-space: nowrap">
<!-- <el-form-item label="入库单号" prop="stockinDetailId" style="white-space: nowrap">
<el-input
v-model="queryParams.stockinDetailId"
placeholder="请输入入库单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item :label="$t('searchViewStockDetail.cargoSpaceId')" prop="cargoSpaceId"> &lt;!&ndash; 货位ID &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoSpaceId"-->
<!-- :placeholder="$t('searchViewStockDetail.inputCargoSpaceId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.trayCode')" prop="trayCode"> &lt;!&ndash; 托盘条码 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.trayCode"-->
<!-- :placeholder="$t('searchViewStockDetail.inputTrayCode')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.quantity')" prop="quantity"> &lt;!&ndash; 数量 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.quantity"-->
<!-- :placeholder="$t('searchViewStockDetail.inputQuantity')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.jobId')" prop="jobId"> &lt;!&ndash; 作业ID &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.jobId"-->
<!-- :placeholder="$t('searchViewStockDetail.inputJobId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.lotNo')" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.lotNo"-->
<!-- :placeholder="$t('searchViewStockDetail.inputLotNo')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
</el-form-item> -->
<!-- <el-form-item :label="$t('searchViewStockDetail.inDate')" prop="inDate"> &lt;!&ndash; 入库时间 &ndash;&gt;-->
<!-- <el-date-picker-->
<!-- v-model="queryParams.inDate"-->
<!-- :placeholder="$t('searchViewStockDetail.inputInDate')"-->
<!-- clearable-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- @keyup.enter.native="handleQuery">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseId"-->
<!-- :placeholder="$t('searchViewStockDetail.inputWarehouseId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.stackingId')" prop="stackingId"> &lt;!&ndash; 剁型ID &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.stackingId"-->
<!-- :placeholder="$t('searchViewStockDetail.inputStackingId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.cargoSpaceName')" prop="cargoSpaceName"> &lt;!&ndash; 货位名称 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoSpaceName"-->
<!-- :placeholder="$t('searchViewStockDetail.inputCargoSpaceName')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.roadwayId')" prop="roadwayId"> &lt;!&ndash; 巷道ID &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.roadwayId"-->
<!-- :placeholder="$t('searchViewStockDetail.inputRoadwayId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.locked')" prop="locked"> &lt;!&ndash; 是否锁定 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.locked"-->
<!-- :placeholder="$t('searchViewStockDetail.inputLocked')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料编号" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编号(SKU)"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item label="品名" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称关键字"
placeholder="请输入品名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item :label="$t('searchViewStockDetail.spec')" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.spec"-->
<!-- :placeholder="$t('searchViewStockDetail.inputSpec')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.unit')" prop="unit"> &lt;!&ndash; 单位 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.unit"-->
<!-- :placeholder="$t('searchViewStockDetail.inputUnit')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewStockDetail.price')" prop="price"> &lt;!&ndash; 价格 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.price"-->
<!-- :placeholder="$t('searchViewStockDetail.inputPrice')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus">&lt;!&ndash; 物料状态 &ndash;&gt;-->
<!-- <el-select v-model="queryParams.productStatus" :placeholder="$t('stockManagement.selectProductStatus')" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.product_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.stockStatus')" prop="stockStatus">&lt;!&ndash; 库存状态 &ndash;&gt;-->
<!-- <el-select v-model="queryParams.stockStatus" :placeholder="$t('stockManagement.stockStatus')" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.stock_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="物料状态" prop="productStatus">
<el-select v-model="queryParams.productStatus" placeholder="请选择物料状态" clearable>
<el-option
v-for="dict in dict.type.product_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">清空</el-button>
@@ -239,19 +118,22 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="700">
<el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="id" align="center" prop="onlyIdentity" />-->
<el-table-column label="库存号" align="left" prop="stockId" width="120"/>
<el-table-column label="货位号" align="left" prop="cargoSpaceId" width="120"/>
<el-table-column label="托盘号" align="left" prop="trayCode" width="120"/>
<el-table-column label="数量(件)" align="right" prop="quantity" width="120"/>
<el-table-column label="作业号" align="left" prop="jobId" width="120"/>
<el-table-column label="入库单号" align="left" prop="stockinDetailId" width="120"/>
<!-- <el-table-column label="序号" align="right" prop="onlyIdentity" width="80"/> -->
<el-table-column label="库存ID" align="left" prop="stockId" width="120"/>
<el-table-column label="货位ID" align="left" prop="cargoSpaceId" width="120"/>
<el-table-column label="托盘条码" align="left" prop="trayCode" width="120"/>
<el-table-column label="数量" align="right" prop="quantity" width="120"/>
<el-table-column label="作业ID" align="left" prop="jobId" width="120"/>
<el-table-column label="批号" align="left" prop="lotNo" width="120"/>
<el-table-column label="入库子单ID" align="left" prop="stockinDetailId" width="120"/>
<el-table-column label="入库时间" align="left" prop="inDate" width="120"/>
<el-table-column label="仓库ID" align="left" prop="warehouseId" width="120"/>
<el-table-column label="仓库名称" align="left" prop="warehouseName" width="120"/>
<el-table-column label="垛型ID" align="left" prop="stackingId" width="120"/>
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="120"/>
<el-table-column label="巷道编号" align="left" prop="roadwayId" width="120"/>
<el-table-column label="巷道ID" align="left" prop="roadwayId" width="120"/>
<el-table-column label="货位状态" align="left" prop="cargoSpaceStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
@@ -267,22 +149,59 @@
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column label="锁定状态" align="left" prop="locked" width="120">
<el-table-column label="是否锁定" align="left" prop="locked" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>
</el-table-column>
<el-table-column label="物料编号" align="left" prop="productId" width="120"/>
<el-table-column label="物料名称" align="left" prop="productName" width="120"/>
<el-table-column label="计量单位" align="left" prop="unit" width="120"/>
<!-- <el-table-column label="物料GUID" align="left" prop="productGuid" width="180"/> -->
<el-table-column label="品名" align="left" prop="productId" width="120"/>
<el-table-column label="品号" align="left" prop="productName" width="120"/>
<el-table-column label="规格" align="left" prop="spec" width="120"/>
<!-- <el-table-column label="单位" align="left" prop="unit" width="100"/> -->
<el-table-column label="价格" align="right" prop="price" width="120"/>
<el-table-column label="产品分类" align="left" prop="parentId" width="120"/>
<el-table-column label="品号描述" align="left" prop="cargoNo" width="120"/>
<el-table-column label="英文名称" align="left" prop="spare1" width="120"/>
<el-table-column label="单件净重(kg)" align="right" width="120" prop="spare2" />
<el-table-column label="长度(mm)" align="right" prop="spare5" width="120"/>
<el-table-column label="宽度(mm)" align="right" prop="spare6" width="120"/>
<el-table-column label="高度(mm)" align="right" prop="spare7" width="120"/>
<el-table-column label="体积(m³)" align="right" prop="spare8" width="120"/>
<el-table-column label="单价(元)" align="right" prop="price" width="120"/>
<el-table-column label="备注" align="left" prop="remark" width="120"/>
<!-- <el-table-column label="单件净重" align="right" prop="spare2" width="120"/> -->
<!-- <el-table-column label="颜色" align="left" prop="spare3" width="120"/> -->
<!-- <el-table-column label="序列号" align="left" prop="spare4" width="120"/> -->
<!-- <el-table-column label="电压" align="left" prop="spare5" width="120"/> -->
<!-- <el-table-column label="功率" align="left" prop="spare6" width="120"/> -->
<!-- <el-table-column label="相位" align="left" prop="spare7" width="120"/> -->
<!-- <el-table-column label="毛重" align="right" prop="spare8" width="120"/> -->
<el-table-column label="NC号" align="left" prop="spare9" width="120"/>
<el-table-column label="电源线" align="left" prop="spare10" width="120"/>
<el-table-column label="插头" align="left" prop="spare11" width="120"/>
<el-table-column label="接嘴" align="left" prop="spare12" width="120"/>
<el-table-column label="快捷码" align="left" prop="spare13" width="120"/>
<el-table-column label="库存单位编号" align="left" prop="spare14" width="120"/>
<el-table-column label="库存单位名称" align="left" prop="spare15" width="120"/>
<el-table-column label="品号群组" align="left" prop="spare16" width="120"/>
<el-table-column label="归类品" align="left" prop="spare17" width="120"/>
<el-table-column label="计量体系" align="left" prop="spare18" width="120"/>
<el-table-column label="群组名称" align="left" prop="spare19" width="120"/>
<el-table-column label="批号管理" align="left" prop="spare20" width="120"/>
<el-table-column label="状态" align="left" prop="spare21" width="120"/>
<el-table-column label="产品大类" align="left" prop="spare22" width="120"/>
<el-table-column label="产品二类" align="left" prop="spare23" width="120"/>
<el-table-column label="产品线/产品系列" align="left" prop="spare24" width="120"/>
<el-table-column label="BOM状态" align="left" prop="spare25" width="120"/>
<el-table-column label="产品定位" align="left" prop="spare26" width="120"/>
<el-table-column label="电脑板型号" align="left" prop="spare27" width="120"/>
<el-table-column label="非标要求" align="left" prop="spare28" width="120"/>
<el-table-column label="品牌" align="left" prop="spare29" width="120"/>
<el-table-column label="非标颜色" align="left" prop="spare30" width="120"/>
<el-table-column label="主颜色" align="left" prop="spare31" width="120"/>
<el-table-column label="辅助颜色" align="left" prop="spare32" width="120"/>
<el-table-column label="是否标准款" align="left" prop="spare33" width="120"/>
<el-table-column label="包装方式" align="left" prop="spare34" width="120"/>
<el-table-column label="主要包装方式" align="left" prop="spare35" width="120"/>
<el-table-column label="长" align="right" prop="spare36" width="120"/>
<el-table-column label="宽" align="right" prop="spare37" width="120"/>
<el-table-column label="高" align="right" prop="spare38" width="120"/>
<el-table-column label="包装材积" align="right" prop="spare39" width="120"/>
<el-table-column label="描述" align="left" prop="remark" width="120"/>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@@ -423,16 +342,62 @@ export default {
stockinDetailId: null,
inDate: null,
warehouseId: null,
warehouseName: null,
stackingId: null,
cargoSpaceName: null,
roadwayId: null,
cargoSpaceStatus: null,
stockStatus: null,
productStatus: null,
locked: null,
productGuid: null,
productId: null,
productName: null,
spec: null,
unit: null,
price: null
price: null,
parentId: null,
cargoNo: null,
spare1: null,
spare2: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null,
spare8: null,
spare9: null,
spare10: null,
spare11: null,
spare12: null,
spare13: null,
spare14: null,
spare15: null,
spare16: null,
spare17: null,
spare18: null,
spare19: null,
spare20: null,
spare21: null,
spare22: null,
spare23: null,
spare24: null,
spare25: null,
spare26: null,
spare27: null,
spare28: null,
spare29: null,
spare30: null,
spare31: null,
spare32: null,
spare33: null,
spare34: null,
spare35: null,
spare36: null,
spare37: null,
spare38: null,
spare39: null,
remark: null
},
// 表单参数
form: {},

1293
ruoyi-ui/src/views/search/ViewStockSecure/index.vue
View File

File diff suppressed because it is too large Load Diff

1393
ruoyi-ui/src/views/search/ViewStockWarning/index.vue
View File

File diff suppressed because it is too large Load Diff

1079
ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
View File

File diff suppressed because it is too large Load Diff

947
ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
View File

File diff suppressed because it is too large Load Diff