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

空托盘入库

Browse Source
This commit is contained in:
liuhanqing
2025-10-27 15:13:02 +08:00
parent be56b3be9d
commit b7c7597193
11 changed files with 1000 additions and 1908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java
View File

@@ -30,6 +30,8 @@ public class InstockInVo {
@NotNull
private String productType;
private String remark;
private List<BasProduct> productVoList;

1
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
View File

@@ -109,6 +109,7 @@ public class InStockinServiceImpl implements IInStockinService
inStockin.setStatus("1");
inStockin.setStockSource("1");
inStockin.setSpare1(inStockinVo.getProductType());
inStockin.setSpare5(inStockinVo.getRemark());
inStockinMapper.insertInStockin(inStockin);
for (int i = 1; i <= productVoList.size(); i++) {
BasProduct basProduct = productVoList.get(i-1);

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

@@ -311,7 +311,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
} else {
return AjaxResult.warn("不存在子作业");
}
}else {
}else if ("1".equals(mydoJob.getInOrOut()) || "2".equals(mydoJob.getInOrOut())){
//正常入库任务
MydoJobDetail param = new MydoJobDetail();
param.setJobId(jobId);
@@ -355,24 +355,40 @@ public class MydoJobServiceImpl implements IMydoJobService {
updateMydoJob(mydoJob);
// 插入任务历史表 删除任务
insertHistory(mydoJob.getJobId());
//修改回传单据表状态
/*if ("1".equals(mydoJob.getInOrOut())){
//调拨单
TransferBillCallback transferBillCallbackParam = new TransferBillCallback();
transferBillCallbackParam.setJobId(mydoJob.getJobId());
List<TransferBillCallback> transferBillCallbacks = transferBillCallbackService.selectTransferBillCallbackList(transferBillCallbackParam);
if (CollUtil.isNotEmpty(transferBillCallbacks)){
for (TransferBillCallback transferBillCallback : transferBillCallbacks) {
transferBillCallback.setStatus("2");
transferBillCallbackService.updateTransferBillCallback(transferBillCallback);
}
}
}*/
return AjaxResult.success();
} else {
return AjaxResult.warn("不存在子作业");
}
}else if ("3".equals(mydoJob.getInOrOut())){
//空托盘入库
//正常入库任务
MydoJobDetail param = new MydoJobDetail();
param.setJobId(jobId);
List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param);
BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(mydoJob.getCargoSpaceId());
List<BasStock> list = new ArrayList<>();
for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1");
list.add(stockByInStockinDetail);
}
//插入库存信息
basStockService.insertBasStockList(list);
//修改货位状态
basCargoSpace.setStatus("2");
basCargoSpace.setTrayCode(mydoJob.getTrayCode());
basCargoSpace.setCargoSpaceId(mydoJob.getCargoSpaceId());
basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
//结束任务
mydoJob.setStatus("4");
mydoJob.setFinishTime(DateUtil.formatDateTime(DateUtil.date()));
updateMydoJob(mydoJob);
// 插入任务历史表 删除任务
insertHistory(mydoJob.getJobId());
return AjaxResult.success();
}else {
return AjaxResult.warn("不存在入库类型");
}
}

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

@@ -22,10 +22,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 入库单据历史Controller
* 入库单据流水Controller
*
* @author gw
* @date 2025-09-19
* @author ruoyi
* @date 2025-10-27
*/
@RestController
@RequestMapping("/search/ViewStockinHistory")
@@ -35,7 +35,7 @@ public class ViewStockinHistoryController extends BaseController
private IViewStockinHistoryService viewStockinHistoryService;
/**
* 查询入库单据历史列表
* 查询入库单据流水列表
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:list')")
@GetMapping("/list")
@@ -47,33 +47,33 @@ public class ViewStockinHistoryController extends BaseController
}
/**
* 导出入库单据历史列表
* 导出入库单据流水列表
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:export')")
@Log(title = "入库单据历史", businessType = BusinessType.EXPORT)
@Log(title = "入库单据流水", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ViewStockinHistory viewStockinHistory)
{
List<ViewStockinHistory> list = viewStockinHistoryService.selectViewStockinHistoryList(viewStockinHistory);
ExcelUtil<ViewStockinHistory> util = new ExcelUtil<ViewStockinHistory>(ViewStockinHistory.class);
util.exportExcel(response, list, "入库单据历史数据");
util.exportExcel(response, list, "入库单据流水数据");
}
/**
* 获取入库单据历史详细信息
* 获取入库单据流水详细信息
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:query')")
@GetMapping(value = "/{stockinGuid}")
public AjaxResult getInfo(@PathVariable("stockinGuid") String stockinGuid)
@GetMapping(value = "/{stockinId}")
public AjaxResult getInfo(@PathVariable("stockinId") String stockinId)
{
return success(viewStockinHistoryService.selectViewStockinHistoryByStockinGuid(stockinGuid));
return success(viewStockinHistoryService.selectViewStockinHistoryByStockinId(stockinId));
}
/**
* 新增入库单据历史
* 新增入库单据流水
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:add')")
@Log(title = "入库单据历史", businessType = BusinessType.INSERT)
@Log(title = "入库单据流水", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ViewStockinHistory viewStockinHistory)
{
@@ -81,10 +81,10 @@ public class ViewStockinHistoryController extends BaseController
}
/**
* 修改入库单据历史
* 修改入库单据流水
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:edit')")
@Log(title = "入库单据历史", businessType = BusinessType.UPDATE)
@Log(title = "入库单据流水", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ViewStockinHistory viewStockinHistory)
{
@@ -92,13 +92,13 @@ public class ViewStockinHistoryController extends BaseController
}
/**
* 删除入库单据历史
* 删除入库单据流水
*/
@PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:remove')")
@Log(title = "入库单据历史", businessType = BusinessType.DELETE)
@DeleteMapping("/{stockinGuids}")
public AjaxResult remove(@PathVariable String[] stockinGuids)
@Log(title = "入库单据流水", businessType = BusinessType.DELETE)
@DeleteMapping("/{stockinIds}")
public AjaxResult remove(@PathVariable String[] stockinIds)
{
return toAjax(viewStockinHistoryService.deleteViewStockinHistoryByStockinGuids(stockinGuids));
return toAjax(viewStockinHistoryService.deleteViewStockinHistoryByStockinIds(stockinIds));
}
}

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

@@ -1,347 +1,414 @@
package com.ruoyi.search.ViewStockinHistory.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 入库单据历史对象 view_stockin_history
* 入库单据流水对象 view_stockin_history
*
* @author gw
* @date 2025-09-19
* @author ruoyi
* @date 2025-10-27
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class ViewStockinHistory extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 入库单guid */
// @Excel(name = "入库单guid")
private String stockinGuid;
/** 入库单号 */
@Excel(name = "入库单号")
private String stockinId;
/** 入库明细ID */
/** 入库子单号 */
@Excel(name = "入库子单号")
private String stockinDetailId;
/** 入库类型 */
@Excel(name = "入库类型", dictType = "in_job_type")
private String inType;
/** 物料编码 */
@Excel(name = "物料编码")
private String productId;
/** 物料名称 */
@Excel(name = "物料名称")
private String productName;
/** 规格型号 */
@Excel(name = "规格型号")
private String spec;
/** 生产图号 */
@Excel(name = "生产图号")
private String cargoNo;
/** 产品状态 */
@Excel(name = "产品状态")
private String productType;
/** 计划数量 */
@Excel(name = "计划数量")
private String quantity;
/** 扫码数量 */
@Excel(name = "扫码数量")
private String scanNum;
/** 实际数量 */
@Excel(name = "实际数量")
private String assignNum;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 单价 */
@Excel(name = "单价")
private String price;
/** 单据金额 */
@Excel(name = "单据金额")
private String priceTotal;
/** 供应商代号 */
@Excel(name = "供应商代号")
private String supplierNo;
/** 供应商名称 */
@Excel(name = "供应商名称")
private String supplierName;
/** 合同号 */
@Excel(name = "合同号")
private String spare6;
/** 台次 */
@Excel(name = "台次")
private String spare5;
/** 件次 */
@Excel(name = "件次")
private String spare7;
/** 账套 */
@Excel(name = "账套")
private String spare3;
/** 创建用户 */
@Excel(name = "创建用户")
private String createManId;
/** 创建时间 */
@Excel(name = "创建时间")
private String createDate;
/** 创建人 */
@Excel(name = "创建人")
private String createManId;
/** ERP单号 */
@Excel(name = "订单号")
private String erpBill;
/** 物料编码 */
@Excel(name = "物料编码")
private String productId;
/** 物料名称 */
@Excel(name = "物料名称")
private String productName;
/** 供应商名称 */
@Excel(name = "供应商名称")
private String supplierName;
/** 单据状态 */
@Excel(name = "单据状态")
private String status;
/** 仓库ID */
// @Excel(name = "仓库ID")
private String warehouseId;
/** 完成时间 */
// @Excel(name = "完成时间")
private String finishDate;
/** 单据来源 */
// @Excel(name = "单据来源")
private String stockSource;
/** 部门编码 */
// @Excel(name = "部门编码")
private String departmentNo;
/** 班组编码 */
// @Excel(name = "班组编码")
private String classNo;
/** 供应商编号 */
// @Excel(name = "供应商编号")
private String supplierNo;
/** 供应商简称 */
// @Excel(name = "供应商简称")
private String simpleName;
/** 联系人 */
// @Excel(name = "联系人")
private String contactName;
/** 联系电话 */
// @Excel(name = "联系电话")
private String contactNumber;
/** 供应商地址 */
// @Excel(name = "供应商地址")
private String address;
/** 批次号 */
@Excel(name = "批次号")
private String lotNo;
/** 计划数量 */
// @Excel(name = "计划数量")
private String quantity;
/** 计划箱数 */
// @Excel(name = "计划箱数")
private String quantityX;
/** 计划件数 */
// @Excel(name = "计划件数")
private String quantityJ;
/** 实际数量 */
// @Excel(name = "实际数量")
private String assignNum;
/** 实际箱数 */
// @Excel(name = "实际箱数")
private String assignNumX;
/** 实际件数 */
// @Excel(name = "实际件数")
private String assignNumJ;
/** 扫码数量 */
// @Excel(name = "扫码数量")
private String scanNum;
/** 扫码箱数 */
// @Excel(name = "扫码箱数")
private String scanNumX;
/** 扫码件数 */
// @Excel(name = "扫码件数")
private String scanNumJ;
/** 入库日期 */
// @Excel(name = "入库日期")
private String printDate;
/** 库存状态 */
@Excel(name = "库存状态" ,dictType = "stock_status")
private String stockStatus;
/** 物料主键 */
// @Excel(name = "物料主键")
private String productGuid;
/** 产品分类 */
// @Excel(name = "产品分类")
private String parentId;
/** 品号描述 */
@Excel(name = "品号描述")
private String price;
/** 英文描述 */
@Excel(name = "英文描述")
private String cargoNo;
/** 图号 */
@Excel(name = "图号")
private String unit;
/** 规格 */
@Excel(name = "规格")
private String spec;
/** 型号 */
// @Excel(name = "型号")
private String spare1;
/** 单件净重 */
// @Excel(name = "单件净重")
private String spare2;
/** 颜色 */
// @Excel(name = "颜色")
private String spare3;
/** 序列号 */
// @Excel(name = "序列号")
private String spare4;
/** 电压 */
// @Excel(name = "电压")
private String spare5;
/** 功率 */
// @Excel(name = "功率")
private String spare6;
/** 相位 */
// @Excel(name = "相位")
private String spare7;
/** 毛重 */
// @Excel(name = "毛重")
/** 质量 */
@Excel(name = "质量")
private String spare8;
/** NC号 */
@Excel(name = "NC号")
private String spare9;
/** 来源 */
@Excel(name = "来源")
private String spare1;
/** 电源线 */
@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 spare4;
/** 状态 */
@Excel(name = "状态")
private String spare21;
private String spare2;
/** 产品大类 */
@Excel(name = "产品大类")
private String spare22;
public void setStockinId(String stockinId)
{
this.stockinId = stockinId;
}
/** 产品二类 */
@Excel(name = "产品二类")
private String spare23;
public String getStockinId()
{
return stockinId;
}
/** 产品线/产品系列 */
@Excel(name = "产品线/产品系列")
private String spare24;
public void setStockinDetailId(String stockinDetailId)
{
this.stockinDetailId = stockinDetailId;
}
/** BOM状态 */
@Excel(name = "BOM状态")
private String spare25;
public String getStockinDetailId()
{
return stockinDetailId;
}
/** 产品定位 */
@Excel(name = "产品定位")
private String spare26;
public void setProductId(String productId)
{
this.productId = productId;
}
/** 电脑板型号 */
@Excel(name = "电脑板型号")
private String spare27;
public String getProductId()
{
return productId;
}
/** 非标要求 */
@Excel(name = "非标要求")
private String spare28;
public void setProductName(String productName)
{
this.productName = productName;
}
/** 品牌 */
@Excel(name = "品牌")
private String spare29;
public String getProductName()
{
return productName;
}
/** 非标颜色 */
@Excel(name = "非标颜色")
private String spare30;
public void setSpec(String spec)
{
this.spec = spec;
}
/** 主颜色 */
@Excel(name = "主颜色")
private String spare31;
public String getSpec()
{
return spec;
}
/** 辅助颜色 */
@Excel(name = "辅助颜色")
private String spare32;
public void setCargoNo(String cargoNo)
{
this.cargoNo = cargoNo;
}
/** 是否标准款 */
@Excel(name = "是否标准款")
private String spare33;
public String getCargoNo()
{
return cargoNo;
}
/** 包装方式 */
@Excel(name = "包装方式")
private String spare34;
public void setProductType(String productType)
{
this.productType = productType;
}
/** 主要包装方式 */
@Excel(name = "主要包装方式")
private String spare35;
public String getProductType()
{
return productType;
}
/** 长 */
@Excel(name = "长")
private String spare36;
public void setQuantity(String quantity)
{
this.quantity = quantity;
}
/** 宽 */
@Excel(name = "宽")
private String spare37;
public String getQuantity()
{
return quantity;
}
/** 高 */
@Excel(name = "高")
private String spare38;
public void setScanNum(String scanNum)
{
this.scanNum = scanNum;
}
/** 包装材积 */
@Excel(name = "包装材积")
private String spare39;
@Excel(name = "描述")
private String remark;
/** 仓库名称 */
// @Excel(name = "仓库名称")
private String warehouseName;
public String getScanNum()
{
return scanNum;
}
public void setAssignNum(String assignNum)
{
this.assignNum = assignNum;
}
public String getAssignNum()
{
return assignNum;
}
public void setUnit(String unit)
{
this.unit = unit;
}
public String getUnit()
{
return unit;
}
public void setPrice(String price)
{
this.price = price;
}
public String getPrice()
{
return price;
}
public void setPriceTotal(String priceTotal)
{
this.priceTotal = priceTotal;
}
public String getPriceTotal()
{
return priceTotal;
}
public void setSupplierNo(String supplierNo)
{
this.supplierNo = supplierNo;
}
public String getSupplierNo()
{
return supplierNo;
}
public void setSupplierName(String supplierName)
{
this.supplierName = supplierName;
}
public String getSupplierName()
{
return supplierName;
}
public void setSpare6(String spare6)
{
this.spare6 = spare6;
}
public String getSpare6()
{
return spare6;
}
public void setSpare5(String spare5)
{
this.spare5 = spare5;
}
public String getSpare5()
{
return spare5;
}
public void setSpare7(String spare7)
{
this.spare7 = spare7;
}
public String getSpare7()
{
return spare7;
}
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
{
return spare3;
}
public void setCreateManId(String createManId)
{
this.createManId = createManId;
}
public String getCreateManId()
{
return createManId;
}
public void setCreateDate(String createDate)
{
this.createDate = createDate;
}
public String getCreateDate()
{
return createDate;
}
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
{
return status;
}
public void setSpare8(String spare8)
{
this.spare8 = spare8;
}
public String getSpare8()
{
return spare8;
}
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1()
{
return spare1;
}
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4()
{
return spare4;
}
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare2()
{
return spare2;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("stockinId", getStockinId())
.append("stockinDetailId", getStockinDetailId())
.append("productId", getProductId())
.append("productName", getProductName())
.append("spec", getSpec())
.append("cargoNo", getCargoNo())
.append("productType", getProductType())
.append("quantity", getQuantity())
.append("scanNum", getScanNum())
.append("assignNum", getAssignNum())
.append("unit", getUnit())
.append("price", getPrice())
.append("priceTotal", getPriceTotal())
.append("supplierNo", getSupplierNo())
.append("supplierName", getSupplierName())
.append("spare6", getSpare6())
.append("spare5", getSpare5())
.append("spare7", getSpare7())
.append("spare3", getSpare3())
.append("createManId", getCreateManId())
.append("createDate", getCreateDate())
.append("status", getStatus())
.append("spare8", getSpare8())
.append("remark", getRemark())
.append("spare1", getSpare1())
.append("spare4", getSpare4())
.append("spare2", getSpare2())
.toString();
}
}

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

@@ -4,58 +4,58 @@ import java.util.List;
import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
/**
* 入库单据历史Mapper接口
* 入库单据流水Mapper接口
*
* @author gw
* @date 2025-09-19
* @author ruoyi
* @date 2025-10-27
*/
public interface ViewStockinHistoryMapper
{
/**
* 查询入库单据历史
* 查询入库单据流水
*
* @param stockinGuid 入库单据历史主键
* @return 入库单据历史
* @param stockinId 入库单据流水主键
* @return 入库单据流水
*/
public ViewStockinHistory selectViewStockinHistoryByStockinGuid(String stockinGuid);
public ViewStockinHistory selectViewStockinHistoryByStockinId(String stockinId);
/**
* 查询入库单据历史列表
* 查询入库单据流水列表
*
* @param viewStockinHistory 入库单据历史
* @return 入库单据历史集合
* @param viewStockinHistory 入库单据流水
* @return 入库单据流水集合
*/
public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory);
/**
* 新增入库单据历史
* 新增入库单据流水
*
* @param viewStockinHistory 入库单据历史
* @param viewStockinHistory 入库单据流水
* @return 结果
*/
public int insertViewStockinHistory(ViewStockinHistory viewStockinHistory);
/**
* 修改入库单据历史
* 修改入库单据流水
*
* @param viewStockinHistory 入库单据历史
* @param viewStockinHistory 入库单据流水
* @return 结果
*/
public int updateViewStockinHistory(ViewStockinHistory viewStockinHistory);
/**
* 删除入库单据历史
* 删除入库单据流水
*
* @param stockinGuid 入库单据历史主键
* @param stockinId 入库单据流水主键
* @return 结果
*/
public int deleteViewStockinHistoryByStockinGuid(String stockinGuid);
public int deleteViewStockinHistoryByStockinId(String stockinId);
/**
* 批量删除入库单据历史
* 批量删除入库单据流水
*
* @param stockinGuids 需要删除的数据主键集合
* @param stockinIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteViewStockinHistoryByStockinGuids(String[] stockinGuids);
public int deleteViewStockinHistoryByStockinIds(String[] stockinIds);
}

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

@@ -4,58 +4,58 @@ import java.util.List;
import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
/**
* 入库单据历史Service接口
* 入库单据流水Service接口
*
* @author gw
* @date 2025-09-19
* @author ruoyi
* @date 2025-10-27
*/
public interface IViewStockinHistoryService
{
/**
* 查询入库单据历史
* 查询入库单据流水
*
* @param stockinGuid 入库单据历史主键
* @return 入库单据历史
* @param stockinId 入库单据流水主键
* @return 入库单据流水
*/
public ViewStockinHistory selectViewStockinHistoryByStockinGuid(String stockinGuid);
public ViewStockinHistory selectViewStockinHistoryByStockinId(String stockinId);
/**
* 查询入库单据历史列表
* 查询入库单据流水列表
*
* @param viewStockinHistory 入库单据历史
* @return 入库单据历史集合
* @param viewStockinHistory 入库单据流水
* @return 入库单据流水集合
*/
public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory);
/**
* 新增入库单据历史
* 新增入库单据流水
*
* @param viewStockinHistory 入库单据历史
* @param viewStockinHistory 入库单据流水
* @return 结果
*/
public int insertViewStockinHistory(ViewStockinHistory viewStockinHistory);
/**
* 修改入库单据历史
* 修改入库单据流水
*
* @param viewStockinHistory 入库单据历史
* @param viewStockinHistory 入库单据流水
* @return 结果
*/
public int updateViewStockinHistory(ViewStockinHistory viewStockinHistory);
/**
* 批量删除入库单据历史
* 批量删除入库单据流水
*
* @param stockinGuids 需要删除的入库单据历史主键集合
* @param stockinIds 需要删除的入库单据流水主键集合
* @return 结果
*/
public int deleteViewStockinHistoryByStockinGuids(String[] stockinGuids);
public int deleteViewStockinHistoryByStockinIds(String[] stockinIds);
/**
* 删除入库单据历史信息
* 删除入库单据流水信息
*
* @param stockinGuid 入库单据历史主键
* @param stockinId 入库单据流水主键
* @return 结果
*/
public int deleteViewStockinHistoryByStockinGuid(String stockinGuid);
public int deleteViewStockinHistoryByStockinId(String stockinId);
}

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

@@ -8,10 +8,10 @@ import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService;
/**
* 入库单据历史Service业务层处理
* 入库单据流水Service业务层处理
*
* @author gw
* @date 2025-09-19
* @author ruoyi
* @date 2025-10-27
*/
@Service
public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
@@ -20,22 +20,22 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
private ViewStockinHistoryMapper viewStockinHistoryMapper;
/**
* 查询入库单据历史
* 查询入库单据流水
*
* @param stockinGuid 入库单据历史主键
* @return 入库单据历史
* @param stockinId 入库单据流水主键
* @return 入库单据流水
*/
@Override
public ViewStockinHistory selectViewStockinHistoryByStockinGuid(String stockinGuid)
public ViewStockinHistory selectViewStockinHistoryByStockinId(String stockinId)
{
return viewStockinHistoryMapper.selectViewStockinHistoryByStockinGuid(stockinGuid);
return viewStockinHistoryMapper.selectViewStockinHistoryByStockinId(stockinId);
}
/**
* 查询入库单据历史列表
* 查询入库单据流水列表
*
* @param viewStockinHistory 入库单据历史
* @return 入库单据历史
* @param viewStockinHistory 入库单据流水
* @return 入库单据流水
*/
@Override
public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory)
@@ -44,9 +44,9 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
}
/**
* 新增入库单据历史
* 新增入库单据流水
*
* @param viewStockinHistory 入库单据历史
* @param viewStockinHistory 入库单据流水
* @return 结果
*/
@Override
@@ -56,9 +56,9 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
}
/**
* 修改入库单据历史
* 修改入库单据流水
*
* @param viewStockinHistory 入库单据历史
* @param viewStockinHistory 入库单据流水
* @return 结果
*/
@Override
@@ -68,26 +68,26 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
}
/**
* 批量删除入库单据历史
* 批量删除入库单据流水
*
* @param stockinGuids 需要删除的入库单据历史主键
* @param stockinIds 需要删除的入库单据流水主键
* @return 结果
*/
@Override
public int deleteViewStockinHistoryByStockinGuids(String[] stockinGuids)
public int deleteViewStockinHistoryByStockinIds(String[] stockinIds)
{
return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinGuids(stockinGuids);
return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinIds(stockinIds);
}
/**
* 删除入库单据历史信息
* 删除入库单据流水信息
*
* @param stockinGuid 入库单据历史主键
* @param stockinId 入库单据流水主键
* @return 结果
*/
@Override
public int deleteViewStockinHistoryByStockinGuid(String stockinGuid)
public int deleteViewStockinHistoryByStockinId(String stockinId)
{
return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinGuid(stockinGuid);
return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinId(stockinId);
}
}

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

@@ -5,445 +5,179 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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" />
<result property="inType" column="in_type" />
<result property="createDate" column="create_date" />
<result property="createManId" column="create_man_id" />
<result property="status" column="status" />
<result property="warehouseId" column="warehouse_id" />
<result property="finishDate" column="finish_date" />
<result property="erpBill" column="erp_bill" />
<result property="stockSource" column="stock_source" />
<result property="departmentNo" column="department_no" />
<result property="classNo" column="class_no" />
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<result property="cargoNo" column="cargo_no" />
<result property="productType" column="productType" />
<result property="quantity" column="quantity" />
<result property="scanNum" column="scan_num" />
<result property="assignNum" column="assign_num" />
<result property="unit" column="unit" />
<result property="price" column="price" />
<result property="priceTotal" column="priceTotal" />
<result property="supplierNo" column="supplier_no" />
<result property="supplierName" column="supplier_name" />
<result property="simpleName" column="simple_name" />
<result property="contactName" column="contact_name" />
<result property="contactNumber" column="contact_number" />
<result property="address" column="address" />
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="lotNo" column="lot_no" />
<result property="quantity" column="quantity" />
<result property="quantityX" column="quantity_x" />
<result property="quantityJ" column="quantity_j" />
<result property="assignNum" column="assign_num" />
<result property="assignNumX" column="assign_num_x" />
<result property="assignNumJ" column="assign_num_j" />
<result property="scanNum" column="scan_num" />
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
<result property="printDate" column="print_date" />
<result property="stockStatus" column="stock_status" />
<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="spare6" column="spare6" />
<result property="spare5" column="spare5" />
<result property="spare7" column="spare7" />
<result property="spare3" column="spare3" />
<result property="createManId" column="create_man_id" />
<result property="createDate" column="create_date" />
<result property="status" column="status" />
<result property="spare8" column="spare8" />
<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" />
<result property="spare2" column="spare2" />
</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, 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
select stockin_id, stockin_detail_id, product_id, product_name, spec, cargo_no, productType, quantity, scan_num, assign_num, unit, price, priceTotal, supplier_no, supplier_name, spare6, spare5, spare7, spare3, create_man_id, create_date, status, spare8, remark, spare1, spare4, spare2 from view_stockin_history
</sql>
<select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
<include refid="selectViewStockinHistoryVo"/>
<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>
<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="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and finish_date like concat('%', #{finishDate}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no like concat('%', #{departmentNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
<if test="contactName != null and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
<if test="contactNumber != null and contactNumber != ''"> and contact_number like concat('%', #{contactNumber}, '%')</if>
<if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<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 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="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="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</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="warehouseName != null and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="productType != null and productType != ''"> and productType = #{productType}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="priceTotal != null and priceTotal != ''"> and priceTotal = #{priceTotal}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare7 != null and spare7 != ''"> and spare7 = #{spare7}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="spare8 != null and spare8 != ''"> and spare8 = #{spare8}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
</where>
</select>
<select id="selectViewStockinHistoryByStockinGuid" parameterType="String" resultMap="ViewStockinHistoryResult">
<select id="selectViewStockinHistoryByStockinId" parameterType="String" resultMap="ViewStockinHistoryResult">
<include refid="selectViewStockinHistoryVo"/>
where stockin_guid = #{stockinGuid}
where stockin_id = #{stockinId}
</select>
<insert id="insertViewStockinHistory" parameterType="ViewStockinHistory">
insert into view_stockin_history
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
<if test="stockinId != null">stockin_id,</if>
<if test="inType != null">in_type,</if>
<if test="createDate != null">create_date,</if>
<if test="createManId != null">create_man_id,</if>
<if test="status != null">status,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="finishDate != null">finish_date,</if>
<if test="erpBill != null">erp_bill,</if>
<if test="stockSource != null">stock_source,</if>
<if test="departmentNo != null">department_no,</if>
<if test="classNo != null">class_no,</if>
<if test="stockinId != null and stockinId != ''">stockin_id,</if>
<if test="stockinDetailId != null">stockin_detail_id,</if>
<if test="productId != null">product_id,</if>
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="productType != null">productType,</if>
<if test="quantity != null">quantity,</if>
<if test="scanNum != null">scan_num,</if>
<if test="assignNum != null">assign_num,</if>
<if test="unit != null">unit,</if>
<if test="price != null">price,</if>
<if test="priceTotal != null">priceTotal,</if>
<if test="supplierNo != null">supplier_no,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="simpleName != null">simple_name,</if>
<if test="contactName != null">contact_name,</if>
<if test="contactNumber != null">contact_number,</if>
<if test="address != null">address,</if>
<if test="stockinDetailId != null">stockin_detail_id,</if>
<if test="lotNo != null">lot_no,</if>
<if test="quantity != null">quantity,</if>
<if test="quantityX != null">quantity_x,</if>
<if test="quantityJ != null">quantity_j,</if>
<if test="assignNum != null">assign_num,</if>
<if test="assignNumX != null">assign_num_x,</if>
<if test="assignNumJ != null">assign_num_j,</if>
<if test="scanNum != null">scan_num,</if>
<if test="scanNumX != null">scan_num_x,</if>
<if test="scanNumJ != null">scan_num_j,</if>
<if test="printDate != null">print_date,</if>
<if test="stockStatus != null">stock_status,</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="spare6 != null">spare6,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare3 != null">spare3,</if>
<if test="createManId != null">create_man_id,</if>
<if test="createDate != null and createDate != ''">create_date,</if>
<if test="status != null and status != ''">status,</if>
<if test="spare8 != null">spare8,</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>
<if test="spare2 != null">spare2,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
<if test="stockinId != null">#{stockinId},</if>
<if test="inType != null">#{inType},</if>
<if test="createDate != null">#{createDate},</if>
<if test="createManId != null">#{createManId},</if>
<if test="status != null">#{status},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="finishDate != null">#{finishDate},</if>
<if test="erpBill != null">#{erpBill},</if>
<if test="stockSource != null">#{stockSource},</if>
<if test="departmentNo != null">#{departmentNo},</if>
<if test="classNo != null">#{classNo},</if>
<if test="stockinId != null and stockinId != ''">#{stockinId},</if>
<if test="stockinDetailId != null">#{stockinDetailId},</if>
<if test="productId != null">#{productId},</if>
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="productType != null">#{productType},</if>
<if test="quantity != null">#{quantity},</if>
<if test="scanNum != null">#{scanNum},</if>
<if test="assignNum != null">#{assignNum},</if>
<if test="unit != null">#{unit},</if>
<if test="price != null">#{price},</if>
<if test="priceTotal != null">#{priceTotal},</if>
<if test="supplierNo != null">#{supplierNo},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="simpleName != null">#{simpleName},</if>
<if test="contactName != null">#{contactName},</if>
<if test="contactNumber != null">#{contactNumber},</if>
<if test="address != null">#{address},</if>
<if test="stockinDetailId != null">#{stockinDetailId},</if>
<if test="lotNo != null">#{lotNo},</if>
<if test="quantity != null">#{quantity},</if>
<if test="quantityX != null">#{quantityX},</if>
<if test="quantityJ != null">#{quantityJ},</if>
<if test="assignNum != null">#{assignNum},</if>
<if test="assignNumX != null">#{assignNumX},</if>
<if test="assignNumJ != null">#{assignNumJ},</if>
<if test="scanNum != null">#{scanNum},</if>
<if test="scanNumX != null">#{scanNumX},</if>
<if test="scanNumJ != null">#{scanNumJ},</if>
<if test="printDate != null">#{printDate},</if>
<if test="stockStatus != null">#{stockStatus},</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="spare6 != null">#{spare6},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="createManId != null">#{createManId},</if>
<if test="createDate != null and createDate != ''">#{createDate},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="spare8 != null">#{spare8},</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>
<if test="spare2 != null">#{spare2},</if>
</trim>
</insert>
<update id="updateViewStockinHistory" parameterType="ViewStockinHistory">
update view_stockin_history
<trim prefix="SET" suffixOverrides=",">
<if test="stockinId != null">stockin_id = #{stockinId},</if>
<if test="inType != null">in_type = #{inType},</if>
<if test="createDate != null">create_date = #{createDate},</if>
<if test="createManId != null">create_man_id = #{createManId},</if>
<if test="status != null">status = #{status},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="finishDate != null">finish_date = #{finishDate},</if>
<if test="erpBill != null">erp_bill = #{erpBill},</if>
<if test="stockSource != null">stock_source = #{stockSource},</if>
<if test="departmentNo != null">department_no = #{departmentNo},</if>
<if test="classNo != null">class_no = #{classNo},</if>
<if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="productType != null">productType = #{productType},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="scanNum != null">scan_num = #{scanNum},</if>
<if test="assignNum != null">assign_num = #{assignNum},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="price != null">price = #{price},</if>
<if test="priceTotal != null">priceTotal = #{priceTotal},</if>
<if test="supplierNo != null">supplier_no = #{supplierNo},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="simpleName != null">simple_name = #{simpleName},</if>
<if test="contactName != null">contact_name = #{contactName},</if>
<if test="contactNumber != null">contact_number = #{contactNumber},</if>
<if test="address != null">address = #{address},</if>
<if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="quantityX != null">quantity_x = #{quantityX},</if>
<if test="quantityJ != null">quantity_j = #{quantityJ},</if>
<if test="assignNum != null">assign_num = #{assignNum},</if>
<if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
<if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
<if test="scanNum != null">scan_num = #{scanNum},</if>
<if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
<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="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="spare6 != null">spare6 = #{spare6},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="createManId != null">create_man_id = #{createManId},</if>
<if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="spare8 != null">spare8 = #{spare8},</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>
<if test="spare2 != null">spare2 = #{spare2},</if>
</trim>
where stockin_guid = #{stockinGuid}
where stockin_id = #{stockinId}
</update>
<delete id="deleteViewStockinHistoryByStockinGuid" parameterType="String">
delete from view_stockin_history where stockin_guid = #{stockinGuid}
<delete id="deleteViewStockinHistoryByStockinId" parameterType="String">
delete from view_stockin_history where stockin_id = #{stockinId}
</delete>
<delete id="deleteViewStockinHistoryByStockinGuids" parameterType="String">
delete from view_stockin_history where stockin_guid in
<foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
#{stockinGuid}
<delete id="deleteViewStockinHistoryByStockinIds" parameterType="String">
delete from view_stockin_history where stockin_id in
<foreach item="stockinId" collection="array" open="(" separator="," close=")">
#{stockinId}
</foreach>
</delete>
</mapper>

18
ruoyi-ui/src/api/search/ViewStockinHistory.js
View File

@@ -1,6 +1,6 @@
import request from '@/utils/request'
// 查询入库单据历史列表
// 查询入库单据流水列表
export function listViewStockinHistory(query) {
return request({
url: '/search/ViewStockinHistory/list',
@@ -9,15 +9,15 @@ export function listViewStockinHistory(query) {
})
}
// 查询入库单据历史详细
export function getViewStockinHistory(stockinGuid) {
// 查询入库单据流水详细
export function getViewStockinHistory(stockinId) {
return request({
url: '/search/ViewStockinHistory/' + stockinGuid,
url: '/search/ViewStockinHistory/' + stockinId,
method: 'get'
})
}
// 新增入库单据历史
// 新增入库单据流水
export function addViewStockinHistory(data) {
return request({
url: '/search/ViewStockinHistory',
@@ -26,7 +26,7 @@ export function addViewStockinHistory(data) {
})
}
// 修改入库单据历史
// 修改入库单据流水
export function updateViewStockinHistory(data) {
return request({
url: '/search/ViewStockinHistory',
@@ -35,10 +35,10 @@ export function updateViewStockinHistory(data) {
})
}
// 删除入库单据历史
export function delViewStockinHistory(stockinGuid) {
// 删除入库单据流水
export function delViewStockinHistory(stockinId) {
return request({
url: '/search/ViewStockinHistory/' + stockinGuid,
url: '/search/ViewStockinHistory/' + stockinId,
method: 'delete'
})
}

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

File diff suppressed because it is too large Load Diff