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

盘点差异，入库联查字段修改，历史单据作业查询

Browse Source
This commit is contained in:
liuhanqing
2025-05-29 08:41:12 +08:00
parent 91d042e4e5
commit 4e4c64439c
50 changed files with 2477 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java Normal file
View File

@@ -0,0 +1,104 @@
package com.ruoyi.check.difference.controller;
import java.util.List;
import javax.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.enums.BusinessType;
import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
import com.ruoyi.check.difference.service.ICheckDifferenceRecordService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 盘点差异Controller
*
* @author ruoyi
* @date 2025-05-28
*/
@RestController
@RequestMapping("/check/difference")
public class CheckDifferenceRecordController extends BaseController
{
@Autowired
private ICheckDifferenceRecordService checkDifferenceRecordService;
/**
* 查询盘点差异列表
*/
@PreAuthorize("@ss.hasPermi('check:difference:list')")
@GetMapping("/list")
public TableDataInfo list(CheckDifferenceRecord checkDifferenceRecord)
{
startPage();
List<CheckDifferenceRecord> list = checkDifferenceRecordService.selectCheckDifferenceRecordList(checkDifferenceRecord);
return getDataTable(list);
}
/**
* 导出盘点差异列表
*/
@PreAuthorize("@ss.hasPermi('check:difference:export')")
@Log(title = "盘点差异", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, CheckDifferenceRecord checkDifferenceRecord)
{
List<CheckDifferenceRecord> list = checkDifferenceRecordService.selectCheckDifferenceRecordList(checkDifferenceRecord);
ExcelUtil<CheckDifferenceRecord> util = new ExcelUtil<CheckDifferenceRecord>(CheckDifferenceRecord.class);
util.exportExcel(response, list, "盘点差异数据");
}
/**
* 获取盘点差异详细信息
*/
@PreAuthorize("@ss.hasPermi('check:difference:query')")
@GetMapping(value = "/{checkGuid}")
public AjaxResult getInfo(@PathVariable("checkGuid") String checkGuid)
{
return success(checkDifferenceRecordService.selectCheckDifferenceRecordByCheckGuid(checkGuid));
}
/**
* 新增盘点差异
*/
@PreAuthorize("@ss.hasPermi('check:difference:add')")
@Log(title = "盘点差异", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CheckDifferenceRecord checkDifferenceRecord)
{
return toAjax(checkDifferenceRecordService.insertCheckDifferenceRecord(checkDifferenceRecord));
}
/**
* 修改盘点差异
*/
@PreAuthorize("@ss.hasPermi('check:difference:edit')")
@Log(title = "盘点差异", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CheckDifferenceRecord checkDifferenceRecord)
{
return toAjax(checkDifferenceRecordService.updateCheckDifferenceRecord(checkDifferenceRecord));
}
/**
* 删除盘点差异
*/
@PreAuthorize("@ss.hasPermi('check:difference:remove')")
@Log(title = "盘点差异", businessType = BusinessType.DELETE)
@DeleteMapping("/{checkGuids}")
public AjaxResult remove(@PathVariable String[] checkGuids)
{
return toAjax(checkDifferenceRecordService.deleteCheckDifferenceRecordByCheckGuids(checkGuids));
}
}

218
ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java Normal file
View File

@@ -0,0 +1,218 @@
package com.ruoyi.check.difference.domain;
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;
/**
* 盘点差异对象 check_difference_record
*
* @author ruoyi
* @date 2025-05-28
*/
public class CheckDifferenceRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 盘点id */
private String checkGuid;
/** 盘点单据id */
@Excel(name = "盘点单据id")
private String checkStockDetailId;
/** 库存id */
@Excel(name = "库存id")
private String stockId;
/** 托盘 */
@Excel(name = "托盘")
private String trayCode;
/** 货位id */
@Excel(name = "货位id")
private String cargoSpaceId;
/** 物料id */
@Excel(name = "物料id")
private String productId;
/** 批次号 */
@Excel(name = "批次号")
private String lotNo;
/** 供应商 */
@Excel(name = "供应商")
private String supplier;
/** 客户 */
@Excel(name = "客户")
private String customer;
/** 原值 */
@Excel(name = "原值")
private String oldQuantity;
/** 新值 */
@Excel(name = "新值")
private String newQuantity;
/** 操作方式 */
@Excel(name = "操作方式")
private Long recordType;
/** 物料guid */
@Excel(name = "物料guid")
private String productGuid;
public void setCheckGuid(String checkGuid)
{
this.checkGuid = checkGuid;
}
public String getCheckGuid()
{
return checkGuid;
}
public void setCheckStockDetailId(String checkStockDetailId)
{
this.checkStockDetailId = checkStockDetailId;
}
public String getCheckStockDetailId()
{
return checkStockDetailId;
}
public void setStockId(String stockId)
{
this.stockId = stockId;
}
public String getStockId()
{
return stockId;
}
public void setTrayCode(String trayCode)
{
this.trayCode = trayCode;
}
public String getTrayCode()
{
return trayCode;
}
public void setCargoSpaceId(String cargoSpaceId)
{
this.cargoSpaceId = cargoSpaceId;
}
public String getCargoSpaceId()
{
return cargoSpaceId;
}
public void setProductId(String productId)
{
this.productId = productId;
}
public String getProductId()
{
return productId;
}
public void setLotNo(String lotNo)
{
this.lotNo = lotNo;
}
public String getLotNo()
{
return lotNo;
}
public void setSupplier(String supplier)
{
this.supplier = supplier;
}
public String getSupplier()
{
return supplier;
}
public void setCustomer(String customer)
{
this.customer = customer;
}
public String getCustomer()
{
return customer;
}
public void setOldQuantity(String oldQuantity)
{
this.oldQuantity = oldQuantity;
}
public String getOldQuantity()
{
return oldQuantity;
}
public void setNewQuantity(String newQuantity)
{
this.newQuantity = newQuantity;
}
public String getNewQuantity()
{
return newQuantity;
}
public void setRecordType(Long recordType)
{
this.recordType = recordType;
}
public Long getRecordType()
{
return recordType;
}
public void setProductGuid(String productGuid)
{
this.productGuid = productGuid;
}
public String getProductGuid()
{
return productGuid;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("checkGuid", getCheckGuid())
.append("checkStockDetailId", getCheckStockDetailId())
.append("stockId", getStockId())
.append("trayCode", getTrayCode())
.append("cargoSpaceId", getCargoSpaceId())
.append("productId", getProductId())
.append("lotNo", getLotNo())
.append("supplier", getSupplier())
.append("customer", getCustomer())
.append("oldQuantity", getOldQuantity())
.append("newQuantity", getNewQuantity())
.append("recordType", getRecordType())
.append("createTime", getCreateTime())
.append("productGuid", getProductGuid())
.toString();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/check/difference/mapper/CheckDifferenceRecordMapper.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.check.difference.mapper;
import java.util.List;
import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
/**
* 盘点差异Mapper接口
*
* @author ruoyi
* @date 2025-05-28
*/
public interface CheckDifferenceRecordMapper
{
/**
* 查询盘点差异
*
* @param checkGuid 盘点差异主键
* @return 盘点差异
*/
public CheckDifferenceRecord selectCheckDifferenceRecordByCheckGuid(String checkGuid);
/**
* 查询盘点差异列表
*
* @param checkDifferenceRecord 盘点差异
* @return 盘点差异集合
*/
public List<CheckDifferenceRecord> selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord);
/**
* 新增盘点差异
*
* @param checkDifferenceRecord 盘点差异
* @return 结果
*/
public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord);
/**
* 修改盘点差异
*
* @param checkDifferenceRecord 盘点差异
* @return 结果
*/
public int updateCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord);
/**
* 删除盘点差异
*
* @param checkGuid 盘点差异主键
* @return 结果
*/
public int deleteCheckDifferenceRecordByCheckGuid(String checkGuid);
/**
* 批量删除盘点差异
*
* @param checkGuids 需要删除的数据主键集合
* @return 结果
*/
public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids);
}

61
ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/ICheckDifferenceRecordService.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.check.difference.service;
import java.util.List;
import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
/**
* 盘点差异Service接口
*
* @author ruoyi
* @date 2025-05-28
*/
public interface ICheckDifferenceRecordService
{
/**
* 查询盘点差异
*
* @param checkGuid 盘点差异主键
* @return 盘点差异
*/
public CheckDifferenceRecord selectCheckDifferenceRecordByCheckGuid(String checkGuid);
/**
* 查询盘点差异列表
*
* @param checkDifferenceRecord 盘点差异
* @return 盘点差异集合
*/
public List<CheckDifferenceRecord> selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord);
/**
* 新增盘点差异
*
* @param checkDifferenceRecord 盘点差异
* @return 结果
*/
public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord);
/**
* 修改盘点差异
*
* @param checkDifferenceRecord 盘点差异
* @return 结果
*/
public int updateCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord);
/**
* 批量删除盘点差异
*
* @param checkGuids 需要删除的盘点差异主键集合
* @return 结果
*/
public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids);
/**
* 删除盘点差异信息
*
* @param checkGuid 盘点差异主键
* @return 结果
*/
public int deleteCheckDifferenceRecordByCheckGuid(String checkGuid);
}

95
ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java Normal file
View File

@@ -0,0 +1,95 @@
package com.ruoyi.check.difference.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.check.difference.mapper.CheckDifferenceRecordMapper;
import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
import com.ruoyi.check.difference.service.ICheckDifferenceRecordService;
/**
* 盘点差异Service业务层处理
*
* @author ruoyi
* @date 2025-05-28
*/
@Service
public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordService
{
@Autowired
private CheckDifferenceRecordMapper checkDifferenceRecordMapper;
/**
* 查询盘点差异
*
* @param checkGuid 盘点差异主键
* @return 盘点差异
*/
@Override
public CheckDifferenceRecord selectCheckDifferenceRecordByCheckGuid(String checkGuid)
{
return checkDifferenceRecordMapper.selectCheckDifferenceRecordByCheckGuid(checkGuid);
}
/**
* 查询盘点差异列表
*
* @param checkDifferenceRecord 盘点差异
* @return 盘点差异
*/
@Override
public List<CheckDifferenceRecord> selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord)
{
return checkDifferenceRecordMapper.selectCheckDifferenceRecordList(checkDifferenceRecord);
}
/**
* 新增盘点差异
*
* @param checkDifferenceRecord 盘点差异
* @return 结果
*/
@Override
public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord)
{
checkDifferenceRecord.setCreateTime(DateUtils.getNowDate());
return checkDifferenceRecordMapper.insertCheckDifferenceRecord(checkDifferenceRecord);
}
/**
* 修改盘点差异
*
* @param checkDifferenceRecord 盘点差异
* @return 结果
*/
@Override
public int updateCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord)
{
return checkDifferenceRecordMapper.updateCheckDifferenceRecord(checkDifferenceRecord);
}
/**
* 批量删除盘点差异
*
* @param checkGuids 需要删除的盘点差异主键
* @return 结果
*/
@Override
public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids)
{
return checkDifferenceRecordMapper.deleteCheckDifferenceRecordByCheckGuids(checkGuids);
}
/**
* 删除盘点差异信息
*
* @param checkGuid 盘点差异主键
* @return 结果
*/
@Override
public int deleteCheckDifferenceRecordByCheckGuid(String checkGuid)
{
return checkDifferenceRecordMapper.deleteCheckDifferenceRecordByCheckGuid(checkGuid);
}
}

15
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java
View File

@@ -1,7 +1,13 @@
package com.ruoyi.in.stockin.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +39,8 @@ public class InStockinController extends BaseController
{
@Autowired
private IInStockinService inStockinService;
@Autowired
private IInStockinFinishService inStockinFinishService;
/**
* 查询入库单据列表
@@ -42,7 +50,12 @@ public class InStockinController extends BaseController
public TableDataInfo list(InStockin inStockin)
{
startPage();
List<InStockin> list = inStockinService.selectInStockinList(inStockin);
List<InStockin> list = new ArrayList<>();
if (Convert.toInt(inStockin.getStatus())<4){
list = inStockinService.selectInStockinList(inStockin);
}else {
list = inStockinFinishService.selectInStockinFinishListByInStockin(inStockin);
}
return getDataTable(list);
}

120
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 入库单据对象 in_stockin
*
*
* @author ruoyi
* @date 2025-05-20
*/
@@ -31,8 +31,10 @@ public class InStockin extends BaseEntity
private String createDate;
/** 创建人 */
@Excel(name = "创建人")
private String createManId;
@Excel(name = "创建人")
private String createManName;
/** 单据状态 */
@Excel(name = "单据状态")
@@ -41,6 +43,8 @@ public class InStockin extends BaseEntity
/** 仓库ID */
@Excel(name = "仓库ID")
private String warehouseId;
@Excel(name = "仓库")
private String warehouseName;
/** 完成日期 */
@Excel(name = " 完成日期")
@@ -57,6 +61,8 @@ public class InStockin extends BaseEntity
/** 部门编码 */
@Excel(name = "部门编码")
private String departmentNo;
@Excel(name = "部门")
private String departmentName;
/** 客户编码 */
@Excel(name = "客户编码")
@@ -69,6 +75,8 @@ public class InStockin extends BaseEntity
/** 供应商编码 */
@Excel(name = "供应商编码")
private String supplierNo;
@Excel(name = "供应商")
private String supplierName;
/** 备用字段1 */
@Excel(name = "备用字段1")
@@ -90,192 +98,224 @@ public class InStockin extends BaseEntity
@Excel(name = "备用字段5")
private String spare5;
public void setStockinGuid(String stockinGuid)
public String getCreateManName() {
return createManName;
}
public void setCreateManName(String createManName) {
this.createManName = createManName;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public String getDepartmentName() {
return departmentName;
}
public void setDepartmentName(String departmentName) {
this.departmentName = departmentName;
}
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public void setStockinGuid(String stockinGuid)
{
this.stockinGuid = stockinGuid;
}
public String getStockinGuid()
public String getStockinGuid()
{
return stockinGuid;
}
public void setStockinId(String stockinId)
public void setStockinId(String stockinId)
{
this.stockinId = stockinId;
}
public String getStockinId()
public String getStockinId()
{
return stockinId;
}
public void setInType(String inType)
public void setInType(String inType)
{
this.inType = inType;
}
public String getInType()
public String getInType()
{
return inType;
}
public void setCreateDate(String createDate)
public void setCreateDate(String createDate)
{
this.createDate = createDate;
}
public String getCreateDate()
public String getCreateDate()
{
return createDate;
}
public void setCreateManId(String createManId)
public void setCreateManId(String createManId)
{
this.createManId = createManId;
}
public String getCreateManId()
public String getCreateManId()
{
return createManId;
}
public void setStatus(String status)
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
public String getStatus()
{
return status;
}
public void setWarehouseId(String warehouseId)
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId()
public String getWarehouseId()
{
return warehouseId;
}
public void setFinishDate(String finishDate)
public void setFinishDate(String finishDate)
{
this.finishDate = finishDate;
}
public String getFinishDate()
public String getFinishDate()
{
return finishDate;
}
public void setErpBill(String erpBill)
public void setErpBill(String erpBill)
{
this.erpBill = erpBill;
}
public String getErpBill()
public String getErpBill()
{
return erpBill;
}
public void setStockSource(String stockSource)
public void setStockSource(String stockSource)
{
this.stockSource = stockSource;
}
public String getStockSource()
public String getStockSource()
{
return stockSource;
}
public void setDepartmentNo(String departmentNo)
public void setDepartmentNo(String departmentNo)
{
this.departmentNo = departmentNo;
}
public String getDepartmentNo()
public String getDepartmentNo()
{
return departmentNo;
}
public void setCustomerNo(String customerNo)
public void setCustomerNo(String customerNo)
{
this.customerNo = customerNo;
}
public String getCustomerNo()
public String getCustomerNo()
{
return customerNo;
}
public void setClassNo(String classNo)
public void setClassNo(String classNo)
{
this.classNo = classNo;
}
public String getClassNo()
public String getClassNo()
{
return classNo;
}
public void setSupplierNo(String supplierNo)
public void setSupplierNo(String supplierNo)
{
this.supplierNo = supplierNo;
}
public String getSupplierNo()
public String getSupplierNo()
{
return supplierNo;
}
public void setSpare1(String spare1)
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1()
public String getSpare1()
{
return spare1;
}
public void setSpare2(String spare2)
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare2()
public String getSpare2()
{
return spare2;
}
public void setSpare4(String spare4)
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4()
public String getSpare4()
{
return spare4;
}
public void setSpare3(String spare3)
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
public String getSpare3()
{
return spare3;
}
public void setSpare5(String spare5)
public void setSpare5(String spare5)
{
this.spare5 = spare5;
}
public String getSpare5()
public String getSpare5()
{
return spare5;
}

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

@@ -1,5 +1,6 @@
package com.ruoyi.in.stockin.service.impl;
import java.util.Arrays;
import java.util.List;
import cn.hutool.core.collection.CollUtil;

37
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java
View File

@@ -1,17 +1,15 @@
package com.ruoyi.in.stockindetail.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.convert.Convert;
import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService;
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 org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -23,7 +21,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
/**
* 入库单据子表Controller
*
*
* @author ruoyi
* @date 2025-05-20
*/
@@ -33,6 +31,8 @@ public class InStockinDetailController extends BaseController
{
@Autowired
private IInStockinDetailService inStockinDetailService;
@Autowired
private IInStockinDetailFinishService inStockinDetailFinishService;
/**
* 查询入库单据子表列表
@@ -42,7 +42,12 @@ public class InStockinDetailController extends BaseController
public TableDataInfo list(InStockinDetail inStockinDetail)
{
startPage();
List<InStockinDetail> list = inStockinDetailService.selectInStockinDetailList(inStockinDetail);
List<InStockinDetail> list = new ArrayList<>();
if (Convert.toInt(inStockinDetail.getStatus())<4){
list = inStockinDetailService.selectInStockinDetailList(inStockinDetail);
}else {
list = inStockinDetailFinishService.selectInStockinDetailList(inStockinDetail);
}
return getDataTable(list);
}
@@ -101,4 +106,16 @@ public class InStockinDetailController extends BaseController
{
return toAjax(inStockinDetailService.deleteInStockinDetailByStockinDetailIds(stockinDetailIds));
}
/**
* 打印条码
* @param param
* @return
*/
@PreAuthorize("@ss.hasPermi('in:stockIn:barcodePrinting')")
@Log(title = "入库单据", businessType = BusinessType.INSERT)
@PostMapping("barcodePrinting")
public AjaxResult barcodePrinting(@RequestBody Map<String,Object> param) {
return toAjax(inStockinDetailService.barcodePrinting(param));
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
View File

@@ -133,4 +133,6 @@ public class InStockinDetail extends BaseEntity
@Excel(name = "备用字段6")
private String spare6;
private String status;
}

3
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.in.stockindetail.service;
import java.util.List;
import java.util.Map;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
@@ -74,4 +75,6 @@ public interface IInStockinDetailService
void insertInStockinDetailHistory(InStockin inStockin);
void deleteInStockinDetailByStockinGuid(String stockinGuid);
int barcodePrinting(Map<String,Object> stockinDetailId);
}

8
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.in.stockindetail.service.impl;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import com.ruoyi.in.stockin.domain.InStockin;
import org.springframework.beans.factory.annotation.Autowired;
@@ -107,4 +109,10 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
public void deleteInStockinDetailByStockinGuid(String stockinGuid) {
inStockinDetailMapper.deleteInStockinDetailByStockinGuid(stockinGuid);
}
@Override
public int barcodePrinting(Map<String,Object> map) {
System.out.println(map);
return 0;
}
}

20
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.in.stockindetailfinish.mapper;
import java.util.List;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;
/**
* 历史入库单据子信息Mapper接口
*
*
* @author ruoyi
* @date 2025-05-28
*/
public interface InStockinDetailFinishMapper
public interface InStockinDetailFinishMapper
{
/**
* 查询历史入库单据子信息
*
*
* @param stockinDetailId 历史入库单据子信息主键
* @return 历史入库单据子信息
*/
@@ -21,7 +23,7 @@ public interface InStockinDetailFinishMapper
/**
* 查询历史入库单据子信息列表
*
*
* @param inStockinDetailFinish 历史入库单据子信息
* @return 历史入库单据子信息集合
*/
@@ -29,7 +31,7 @@ public interface InStockinDetailFinishMapper
/**
* 新增历史入库单据子信息
*
*
* @param inStockinDetailFinish 历史入库单据子信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface InStockinDetailFinishMapper
/**
* 修改历史入库单据子信息
*
*
* @param inStockinDetailFinish 历史入库单据子信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface InStockinDetailFinishMapper
/**
* 删除历史入库单据子信息
*
*
* @param stockinDetailId 历史入库单据子信息主键
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface InStockinDetailFinishMapper
/**
* 批量删除历史入库单据子信息
*
*
* @param stockinDetailIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteInStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds);
List<InStockinDetail> selectInStockinDetailFinishListByInStockinDetail(InStockinDetail inStockinDetail);
}

20
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.in.stockindetailfinish.service;
import java.util.List;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;
/**
* 历史入库单据子信息Service接口
*
*
* @author ruoyi
* @date 2025-05-28
*/
public interface IInStockinDetailFinishService
public interface IInStockinDetailFinishService
{
/**
* 查询历史入库单据子信息
*
*
* @param stockinDetailId 历史入库单据子信息主键
* @return 历史入库单据子信息
*/
@@ -21,7 +23,7 @@ public interface IInStockinDetailFinishService
/**
* 查询历史入库单据子信息列表
*
*
* @param inStockinDetailFinish 历史入库单据子信息
* @return 历史入库单据子信息集合
*/
@@ -29,7 +31,7 @@ public interface IInStockinDetailFinishService
/**
* 新增历史入库单据子信息
*
*
* @param inStockinDetailFinish 历史入库单据子信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface IInStockinDetailFinishService
/**
* 修改历史入库单据子信息
*
*
* @param inStockinDetailFinish 历史入库单据子信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface IInStockinDetailFinishService
/**
* 批量删除历史入库单据子信息
*
*
* @param stockinDetailIds 需要删除的历史入库单据子信息主键集合
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface IInStockinDetailFinishService
/**
* 删除历史入库单据子信息信息
*
*
* @param stockinDetailId 历史入库单据子信息主键
* @return 结果
*/
public int deleteInStockinDetailFinishByStockinDetailId(String stockinDetailId);
List<InStockinDetail> selectInStockinDetailList(InStockinDetail inStockinDetail);
}

23
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.in.stockindetailfinish.service.impl;
import java.util.List;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.in.stockindetailfinish.mapper.InStockinDetailFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService;
/**
* 历史入库单据子信息Service业务层处理
*
*
* @author ruoyi
* @date 2025-05-28
*/
@Service
public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishService
public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishService
{
@Autowired
private InStockinDetailFinishMapper inStockinDetailFinishMapper;
/**
* 查询历史入库单据子信息
*
*
* @param stockinDetailId 历史入库单据子信息主键
* @return 历史入库单据子信息
*/
@@ -33,7 +35,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
/**
* 查询历史入库单据子信息列表
*
*
* @param inStockinDetailFinish 历史入库单据子信息
* @return 历史入库单据子信息
*/
@@ -45,7 +47,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
/**
* 新增历史入库单据子信息
*
*
* @param inStockinDetailFinish 历史入库单据子信息
* @return 结果
*/
@@ -57,7 +59,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
/**
* 修改历史入库单据子信息
*
*
* @param inStockinDetailFinish 历史入库单据子信息
* @return 结果
*/
@@ -69,7 +71,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
/**
* 批量删除历史入库单据子信息
*
*
* @param stockinDetailIds 需要删除的历史入库单据子信息主键
* @return 结果
*/
@@ -81,7 +83,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
/**
* 删除历史入库单据子信息信息
*
*
* @param stockinDetailId 历史入库单据子信息主键
* @return 结果
*/
@@ -90,4 +92,9 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
{
return inStockinDetailFinishMapper.deleteInStockinDetailFinishByStockinDetailId(stockinDetailId);
}
@Override
public List<InStockinDetail> selectInStockinDetailList(InStockinDetail inStockinDetail) {
return inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail);
}
}

20
ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.in.stockinfinish.mapper;
import java.util.List;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
/**
* 历史入库单据主信息Mapper接口
*
*
* @author ruoyi
* @date 2025-05-28
*/
public interface InStockinFinishMapper
public interface InStockinFinishMapper
{
/**
* 查询历史入库单据主信息
*
*
* @param stockinGuid 历史入库单据主信息主键
* @return 历史入库单据主信息
*/
@@ -21,7 +23,7 @@ public interface InStockinFinishMapper
/**
* 查询历史入库单据主信息列表
*
*
* @param inStockinFinish 历史入库单据主信息
* @return 历史入库单据主信息集合
*/
@@ -29,7 +31,7 @@ public interface InStockinFinishMapper
/**
* 新增历史入库单据主信息
*
*
* @param inStockinFinish 历史入库单据主信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface InStockinFinishMapper
/**
* 修改历史入库单据主信息
*
*
* @param inStockinFinish 历史入库单据主信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface InStockinFinishMapper
/**
* 删除历史入库单据主信息
*
*
* @param stockinGuid 历史入库单据主信息主键
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface InStockinFinishMapper
/**
* 批量删除历史入库单据主信息
*
*
* @param stockinGuids 需要删除的数据主键集合
* @return 结果
*/
public int deleteInStockinFinishByStockinGuids(String[] stockinGuids);
List<InStockin> selectInStockinFinishListByInStockin(InStockin inStockin);
}

20
ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.in.stockinfinish.service;
import java.util.List;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
/**
* 历史入库单据主信息Service接口
*
*
* @author ruoyi
* @date 2025-05-28
*/
public interface IInStockinFinishService
public interface IInStockinFinishService
{
/**
* 查询历史入库单据主信息
*
*
* @param stockinGuid 历史入库单据主信息主键
* @return 历史入库单据主信息
*/
@@ -21,7 +23,7 @@ public interface IInStockinFinishService
/**
* 查询历史入库单据主信息列表
*
*
* @param inStockinFinish 历史入库单据主信息
* @return 历史入库单据主信息集合
*/
@@ -29,7 +31,7 @@ public interface IInStockinFinishService
/**
* 新增历史入库单据主信息
*
*
* @param inStockinFinish 历史入库单据主信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface IInStockinFinishService
/**
* 修改历史入库单据主信息
*
*
* @param inStockinFinish 历史入库单据主信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface IInStockinFinishService
/**
* 批量删除历史入库单据主信息
*
*
* @param stockinGuids 需要删除的历史入库单据主信息主键集合
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface IInStockinFinishService
/**
* 删除历史入库单据主信息信息
*
*
* @param stockinGuid 历史入库单据主信息主键
* @return 结果
*/
public int deleteInStockinFinishByStockinGuid(String stockinGuid);
List<InStockin> selectInStockinFinishListByInStockin(InStockin inStockin);
}

23
ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.in.stockinfinish.service.impl;
import java.util.List;
import com.ruoyi.in.stockin.domain.InStockin;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
/**
* 历史入库单据主信息Service业务层处理
*
*
* @author ruoyi
* @date 2025-05-28
*/
@Service
public class InStockinFinishServiceImpl implements IInStockinFinishService
public class InStockinFinishServiceImpl implements IInStockinFinishService
{
@Autowired
private InStockinFinishMapper inStockinFinishMapper;
/**
* 查询历史入库单据主信息
*
*
* @param stockinGuid 历史入库单据主信息主键
* @return 历史入库单据主信息
*/
@@ -33,7 +35,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
/**
* 查询历史入库单据主信息列表
*
*
* @param inStockinFinish 历史入库单据主信息
* @return 历史入库单据主信息
*/
@@ -45,7 +47,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
/**
* 新增历史入库单据主信息
*
*
* @param inStockinFinish 历史入库单据主信息
* @return 结果
*/
@@ -57,7 +59,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
/**
* 修改历史入库单据主信息
*
*
* @param inStockinFinish 历史入库单据主信息
* @return 结果
*/
@@ -69,7 +71,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
/**
* 批量删除历史入库单据主信息
*
*
* @param stockinGuids 需要删除的历史入库单据主信息主键
* @return 结果
*/
@@ -81,7 +83,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
/**
* 删除历史入库单据主信息信息
*
*
* @param stockinGuid 历史入库单据主信息主键
* @return 结果
*/
@@ -90,4 +92,9 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
{
return inStockinFinishMapper.deleteInStockinFinishByStockinGuid(stockinGuid);
}
@Override
public List<InStockin> selectInStockinFinishListByInStockin(InStockin inStockin) {
return inStockinFinishMapper.selectInStockinFinishListByInStockin(inStockin);
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
View File

@@ -46,6 +46,8 @@ public class MydoJob
/** 部门ID */
@Excel(name = "部门ID")
private String departmentId;
@Excel(name = "部门")
private String departmentName;
/** 托盘码 */
@Excel(name = "托盘码")

13
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java
View File

@@ -1,15 +1,18 @@
package com.ruoyi.receive.stockin.controller;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import cn.hutool.core.convert.Convert;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -36,6 +39,8 @@ public class ReceiveStockinController extends BaseController
{
@Autowired
private IReceiveStockinService receiveStockinService;
@Autowired
private IReceiveStockinFinishService receiveStockinFinishService;
/**
* 查询收货单据列表
@@ -45,7 +50,13 @@ public class ReceiveStockinController extends BaseController
public TableDataInfo list(ReceiveStockin receiveStockin)
{
startPage();
List<ReceiveStockin> list = receiveStockinService.selectReceiveStockinList(receiveStockin);
List<ReceiveStockin> list = new ArrayList<>() ;
if (Convert.toInt(receiveStockin.getStatus())<1){
list = receiveStockinService.selectReceiveStockinList(receiveStockin);
}else {
list = receiveStockinFinishService.selectReceiveStockinList(receiveStockin);
}
return getDataTable(list);
}

39
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java
View File

@@ -37,6 +37,8 @@ public class ReceiveStockin extends BaseEntity
/** 创建人 */
@Excel(name = "创建人")
private String createManId;
@Excel(name = "创建人")
private String createManName;
/** 单据状态 */
@Excel(name = "单据状态")
@@ -45,6 +47,8 @@ public class ReceiveStockin extends BaseEntity
/** 仓库ID */
@Excel(name = "仓库ID")
private String warehouseId;
@Excel(name = "仓库名称")
private String warehouseName;
/** 备用字段5 */
@Excel(name = "备用字段5")
@@ -81,6 +85,8 @@ public class ReceiveStockin extends BaseEntity
/** 部门编码 */
@Excel(name = "部门编码")
private String departmentNo;
@Excel(name = "部门")
private String departmentName;
/** 客户编码 */
@Excel(name = "客户编码")
@@ -93,7 +99,40 @@ public class ReceiveStockin extends BaseEntity
/** 供应商编码 */
@Excel(name = "供应商编码")
private String supplierNo;
@Excel(name = "供应商名称")
private String supplierName;
public String getCreateManName() {
return createManName;
}
public void setCreateManName(String createManName) {
this.createManName = createManName;
}
public String getDepartmentName() {
return departmentName;
}
public void setDepartmentName(String departmentName) {
this.departmentName = departmentName;
}
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public void setStockinGuid(String stockinGuid)
{

1
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java
View File

@@ -102,6 +102,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
receiveStockin.setStockSource("1");
//receiveStockin.setSpare1(receiveStockVo.getBatchId());
receiveStockin.setCreateManId(Convert.toStr(SecurityUtils.getUserId()));
receiveStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
receiveStockin.setStockinId(iBasJobIdService.getJobId("RED"));
receiveStockin.setStatus("0");
receiveStockinMapper.insertReceiveStockin(receiveStockin);

12
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java
View File

@@ -1,9 +1,12 @@
package com.ruoyi.receive.stockindetail.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.convert.Convert;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinishService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +38,8 @@ public class ReceiveStockinDetailController extends BaseController
{
@Autowired
private IReceiveStockinDetailService receiveStockinDetailService;
@Autowired
private IReceiveStockinDetailFinishService receiveStockinDetailFinishService;
/**
* 查询收货单据子单列表
@@ -44,7 +49,12 @@ public class ReceiveStockinDetailController extends BaseController
public TableDataInfo list(ReceiveStockinDetail receiveStockinDetail)
{
startPage();
List<ReceiveStockinDetail> list = receiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetail);
List<ReceiveStockinDetail> list = new ArrayList<>();
if (Convert.toInt(receiveStockinDetail.getStatus())<1){
list = receiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetail);
}else {
list =receiveStockinDetailFinishService.selectReceiveStockinDetailList(receiveStockinDetail);
}
return getDataTable(list);
}

2
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/domain/ReceiveStockinDetail.java
View File

@@ -126,5 +126,5 @@ public class ReceiveStockinDetail extends BaseEntity
@Excel(name = "备用字段6")
private String spare6;
private String status;
}

20
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/mapper/ReceiveStockinDetailFinishMapper.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.receive.stockindetailfinish.mapper;
import java.util.List;
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
/**
* 历史接收单据子信息Mapper接口
*
*
* @author ruoyi
* @date 2025-05-28
*/
public interface ReceiveStockinDetailFinishMapper
public interface ReceiveStockinDetailFinishMapper
{
/**
* 查询历史接收单据子信息
*
*
* @param stockinDetailId 历史接收单据子信息主键
* @return 历史接收单据子信息
*/
@@ -21,7 +23,7 @@ public interface ReceiveStockinDetailFinishMapper
/**
* 查询历史接收单据子信息列表
*
*
* @param receiveStockinDetailFinish 历史接收单据子信息
* @return 历史接收单据子信息集合
*/
@@ -29,7 +31,7 @@ public interface ReceiveStockinDetailFinishMapper
/**
* 新增历史接收单据子信息
*
*
* @param receiveStockinDetailFinish 历史接收单据子信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface ReceiveStockinDetailFinishMapper
/**
* 修改历史接收单据子信息
*
*
* @param receiveStockinDetailFinish 历史接收单据子信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface ReceiveStockinDetailFinishMapper
/**
* 删除历史接收单据子信息
*
*
* @param stockinDetailId 历史接收单据子信息主键
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface ReceiveStockinDetailFinishMapper
/**
* 批量删除历史接收单据子信息
*
*
* @param stockinDetailIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds);
List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail);
}

20
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/IReceiveStockinDetailFinishService.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.receive.stockindetailfinish.service;
import java.util.List;
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
/**
* 历史接收单据子信息Service接口
*
*
* @author ruoyi
* @date 2025-05-28
*/
public interface IReceiveStockinDetailFinishService
public interface IReceiveStockinDetailFinishService
{
/**
* 查询历史接收单据子信息
*
*
* @param stockinDetailId 历史接收单据子信息主键
* @return 历史接收单据子信息
*/
@@ -21,7 +23,7 @@ public interface IReceiveStockinDetailFinishService
/**
* 查询历史接收单据子信息列表
*
*
* @param receiveStockinDetailFinish 历史接收单据子信息
* @return 历史接收单据子信息集合
*/
@@ -29,7 +31,7 @@ public interface IReceiveStockinDetailFinishService
/**
* 新增历史接收单据子信息
*
*
* @param receiveStockinDetailFinish 历史接收单据子信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface IReceiveStockinDetailFinishService
/**
* 修改历史接收单据子信息
*
*
* @param receiveStockinDetailFinish 历史接收单据子信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface IReceiveStockinDetailFinishService
/**
* 批量删除历史接收单据子信息
*
*
* @param stockinDetailIds 需要删除的历史接收单据子信息主键集合
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface IReceiveStockinDetailFinishService
/**
* 删除历史接收单据子信息信息
*
*
* @param stockinDetailId 历史接收单据子信息主键
* @return 结果
*/
public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId);
List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail);
}

23
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.receive.stockindetailfinish.service.impl;
import java.util.List;
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinish
/**
* 历史接收单据子信息Service业务层处理
*
*
* @author ruoyi
* @date 2025-05-28
*/
@Service
public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDetailFinishService
public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDetailFinishService
{
@Autowired
private ReceiveStockinDetailFinishMapper receiveStockinDetailFinishMapper;
/**
* 查询历史接收单据子信息
*
*
* @param stockinDetailId 历史接收单据子信息主键
* @return 历史接收单据子信息
*/
@@ -33,7 +35,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
/**
* 查询历史接收单据子信息列表
*
*
* @param receiveStockinDetailFinish 历史接收单据子信息
* @return 历史接收单据子信息
*/
@@ -45,7 +47,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
/**
* 新增历史接收单据子信息
*
*
* @param receiveStockinDetailFinish 历史接收单据子信息
* @return 结果
*/
@@ -57,7 +59,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
/**
* 修改历史接收单据子信息
*
*
* @param receiveStockinDetailFinish 历史接收单据子信息
* @return 结果
*/
@@ -69,7 +71,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
/**
* 批量删除历史接收单据子信息
*
*
* @param stockinDetailIds 需要删除的历史接收单据子信息主键
* @return 结果
*/
@@ -81,7 +83,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
/**
* 删除历史接收单据子信息信息
*
*
* @param stockinDetailId 历史接收单据子信息主键
* @return 结果
*/
@@ -90,4 +92,9 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
{
return receiveStockinDetailFinishMapper.deleteReceiveStockinDetailFinishByStockinDetailId(stockinDetailId);
}
@Override
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) {
return receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail);
}
}

20
ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/mapper/ReceiveStockinFinishMapper.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.receive.stockinfinish.mapper;
import java.util.List;
import com.ruoyi.receive.stockin.domain.ReceiveStockin;
import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
/**
* 历史接收单据主信息Mapper接口
*
*
* @author ruoyi
* @date 2025-05-28
*/
public interface ReceiveStockinFinishMapper
public interface ReceiveStockinFinishMapper
{
/**
* 查询历史接收单据主信息
*
*
* @param stockinGuid 历史接收单据主信息主键
* @return 历史接收单据主信息
*/
@@ -21,7 +23,7 @@ public interface ReceiveStockinFinishMapper
/**
* 查询历史接收单据主信息列表
*
*
* @param receiveStockinFinish 历史接收单据主信息
* @return 历史接收单据主信息集合
*/
@@ -29,7 +31,7 @@ public interface ReceiveStockinFinishMapper
/**
* 新增历史接收单据主信息
*
*
* @param receiveStockinFinish 历史接收单据主信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface ReceiveStockinFinishMapper
/**
* 修改历史接收单据主信息
*
*
* @param receiveStockinFinish 历史接收单据主信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface ReceiveStockinFinishMapper
/**
* 删除历史接收单据主信息
*
*
* @param stockinGuid 历史接收单据主信息主键
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface ReceiveStockinFinishMapper
/**
* 批量删除历史接收单据主信息
*
*
* @param stockinGuids 需要删除的数据主键集合
* @return 结果
*/
public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids);
List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin);
}

20
ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/IReceiveStockinFinishService.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.receive.stockinfinish.service;
import java.util.List;
import com.ruoyi.receive.stockin.domain.ReceiveStockin;
import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
/**
* 历史接收单据主信息Service接口
*
*
* @author ruoyi
* @date 2025-05-28
*/
public interface IReceiveStockinFinishService
public interface IReceiveStockinFinishService
{
/**
* 查询历史接收单据主信息
*
*
* @param stockinGuid 历史接收单据主信息主键
* @return 历史接收单据主信息
*/
@@ -21,7 +23,7 @@ public interface IReceiveStockinFinishService
/**
* 查询历史接收单据主信息列表
*
*
* @param receiveStockinFinish 历史接收单据主信息
* @return 历史接收单据主信息集合
*/
@@ -29,7 +31,7 @@ public interface IReceiveStockinFinishService
/**
* 新增历史接收单据主信息
*
*
* @param receiveStockinFinish 历史接收单据主信息
* @return 结果
*/
@@ -37,7 +39,7 @@ public interface IReceiveStockinFinishService
/**
* 修改历史接收单据主信息
*
*
* @param receiveStockinFinish 历史接收单据主信息
* @return 结果
*/
@@ -45,7 +47,7 @@ public interface IReceiveStockinFinishService
/**
* 批量删除历史接收单据主信息
*
*
* @param stockinGuids 需要删除的历史接收单据主信息主键集合
* @return 结果
*/
@@ -53,9 +55,11 @@ public interface IReceiveStockinFinishService
/**
* 删除历史接收单据主信息信息
*
*
* @param stockinGuid 历史接收单据主信息主键
* @return 结果
*/
public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid);
List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin);
}

23
ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.receive.stockinfinish.service.impl;
import java.util.List;
import com.ruoyi.receive.stockin.domain.ReceiveStockin;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.receive.stockinfinish.mapper.ReceiveStockinFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService;
/**
* 历史接收单据主信息Service业务层处理
*
*
* @author ruoyi
* @date 2025-05-28
*/
@Service
public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishService
public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishService
{
@Autowired
private ReceiveStockinFinishMapper receiveStockinFinishMapper;
/**
* 查询历史接收单据主信息
*
*
* @param stockinGuid 历史接收单据主信息主键
* @return 历史接收单据主信息
*/
@@ -33,7 +35,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
/**
* 查询历史接收单据主信息列表
*
*
* @param receiveStockinFinish 历史接收单据主信息
* @return 历史接收单据主信息
*/
@@ -45,7 +47,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
/**
* 新增历史接收单据主信息
*
*
* @param receiveStockinFinish 历史接收单据主信息
* @return 结果
*/
@@ -57,7 +59,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
/**
* 修改历史接收单据主信息
*
*
* @param receiveStockinFinish 历史接收单据主信息
* @return 结果
*/
@@ -69,7 +71,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
/**
* 批量删除历史接收单据主信息
*
*
* @param stockinGuids 需要删除的历史接收单据主信息主键
* @return 结果
*/
@@ -81,7 +83,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
/**
* 删除历史接收单据主信息信息
*
*
* @param stockinGuid 历史接收单据主信息主键
* @return 结果
*/
@@ -90,4 +92,9 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
{
return receiveStockinFinishMapper.deleteReceiveStockinFinishByStockinGuid(stockinGuid);
}
@Override
public List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin) {
return receiveStockinFinishMapper.selectReceiveStockinList(receiveStockin);
}
}

38
ruoyi-admin/src/main/resources/i18n/messages_en_US.properties Normal file
View File

@@ -0,0 +1,38 @@
#????
not.null=* ????
user.jcaptcha.error=?????
user.jcaptcha.expire=??????
user.not.exists=?????/????
user.password.not.match=?????/????
user.password.retry.limit.count=??????{0}?
user.password.retry.limit.exceed=??????{0}??????{1}??
user.password.delete=????????????
user.blocked=????????????
role.blocked=????????????
login.blocked=??????IP?????????
user.logout.success=????
length.not.valid=?????{min}?{max}?????
user.username.not.valid=* 2?20?????????????????????????
user.password.not.valid=* 5-50???
user.email.not.valid=??????
user.mobile.phone.number.not.valid=???????
user.login.success=????
user.register.success=????
user.notfound=?????
user.forcelogout=?????????????
user.unknown.error=??????????
##??????
upload.exceed.maxSize=?????????????????<br/>???????????{0}MB?
upload.filename.exceed.length=????????{0}???
##??
no.permission=??????????????????? [{0}]
no.create.permission=????????????????????? [{0}]
no.update.permission=????????????????????? [{0}]
no.delete.permission=????????????????????? [{0}]
no.export.permission=????????????????????? [{0}]
no.view.permission=????????????????????? [{0}]

38
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties Normal file
View File

@@ -0,0 +1,38 @@
#????
not.null=* ????
user.jcaptcha.error=?????
user.jcaptcha.expire=??????
user.not.exists=?????/????
user.password.not.match=?????/????
user.password.retry.limit.count=??????{0}?
user.password.retry.limit.exceed=??????{0}??????{1}??
user.password.delete=????????????
user.blocked=????????????
role.blocked=????????????
login.blocked=??????IP?????????
user.logout.success=????
length.not.valid=?????{min}?{max}?????
user.username.not.valid=* 2?20?????????????????????????
user.password.not.valid=* 5-50???
user.email.not.valid=??????
user.mobile.phone.number.not.valid=???????
user.login.success=????
user.register.success=????
user.notfound=?????
user.forcelogout=?????????????
user.unknown.error=??????????
##??????
upload.exceed.maxSize=?????????????????<br/>???????????{0}MB?
upload.filename.exceed.length=????????{0}???
##??
no.permission=??????????????????? [{0}]
no.create.permission=????????????????????? [{0}]
no.update.permission=????????????????????? [{0}]
no.delete.permission=????????????????????? [{0}]
no.export.permission=????????????????????? [{0}]
no.view.permission=????????????????????? [{0}]

117
ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml Normal file
View File

@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.check.difference.mapper.CheckDifferenceRecordMapper">
<resultMap type="CheckDifferenceRecord" id="CheckDifferenceRecordResult">
<result property="checkGuid" column="check_guid" />
<result property="checkStockDetailId" column="check_stock_detail_id" />
<result property="stockId" column="stock_id" />
<result property="trayCode" column="tray_code" />
<result property="cargoSpaceId" column="cargo_space_id" />
<result property="productId" column="product_id" />
<result property="lotNo" column="lot_no" />
<result property="supplier" column="supplier" />
<result property="customer" column="customer" />
<result property="oldQuantity" column="old_quantity" />
<result property="newQuantity" column="new_quantity" />
<result property="recordType" column="record_type" />
<result property="createTime" column="create_time" />
<result property="productGuid" column="product_guid" />
</resultMap>
<sql id="selectCheckDifferenceRecordVo">
select check_guid, check_stock_detail_id, stock_id, tray_code, cargo_space_id, product_id, lot_no, supplier, customer, old_quantity, new_quantity, record_type, create_time, product_guid from check_difference_record
</sql>
<select id="selectCheckDifferenceRecordList" parameterType="CheckDifferenceRecord" resultMap="CheckDifferenceRecordResult">
<include refid="selectCheckDifferenceRecordVo"/>
<where>
<if test="checkStockDetailId != null and checkStockDetailId != ''"> and check_stock_detail_id = #{checkStockDetailId}</if>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="supplier != null and supplier != ''"> and supplier = #{supplier}</if>
<if test="customer != null and customer != ''"> and customer = #{customer}</if>
<if test="oldQuantity != null and oldQuantity != ''"> and old_quantity = #{oldQuantity}</if>
<if test="newQuantity != null and newQuantity != ''"> and new_quantity = #{newQuantity}</if>
<if test="recordType != null "> and record_type = #{recordType}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
</where>
</select>
<select id="selectCheckDifferenceRecordByCheckGuid" parameterType="String" resultMap="CheckDifferenceRecordResult">
<include refid="selectCheckDifferenceRecordVo"/>
where check_guid = #{checkGuid}
</select>
<insert id="insertCheckDifferenceRecord" parameterType="CheckDifferenceRecord">
insert into check_difference_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="checkGuid != null">check_guid,</if>
<if test="checkStockDetailId != null">check_stock_detail_id,</if>
<if test="stockId != null">stock_id,</if>
<if test="trayCode != null">tray_code,</if>
<if test="cargoSpaceId != null">cargo_space_id,</if>
<if test="productId != null">product_id,</if>
<if test="lotNo != null">lot_no,</if>
<if test="supplier != null">supplier,</if>
<if test="customer != null">customer,</if>
<if test="oldQuantity != null">old_quantity,</if>
<if test="newQuantity != null">new_quantity,</if>
<if test="recordType != null">record_type,</if>
<if test="createTime != null">create_time,</if>
<if test="productGuid != null">product_guid,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="checkGuid != null">#{checkGuid},</if>
<if test="checkStockDetailId != null">#{checkStockDetailId},</if>
<if test="stockId != null">#{stockId},</if>
<if test="trayCode != null">#{trayCode},</if>
<if test="cargoSpaceId != null">#{cargoSpaceId},</if>
<if test="productId != null">#{productId},</if>
<if test="lotNo != null">#{lotNo},</if>
<if test="supplier != null">#{supplier},</if>
<if test="customer != null">#{customer},</if>
<if test="oldQuantity != null">#{oldQuantity},</if>
<if test="newQuantity != null">#{newQuantity},</if>
<if test="recordType != null">#{recordType},</if>
<if test="createTime != null">#{createTime},</if>
<if test="productGuid != null">#{productGuid},</if>
</trim>
</insert>
<update id="updateCheckDifferenceRecord" parameterType="CheckDifferenceRecord">
update check_difference_record
<trim prefix="SET" suffixOverrides=",">
<if test="checkStockDetailId != null">check_stock_detail_id = #{checkStockDetailId},</if>
<if test="stockId != null">stock_id = #{stockId},</if>
<if test="trayCode != null">tray_code = #{trayCode},</if>
<if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="supplier != null">supplier = #{supplier},</if>
<if test="customer != null">customer = #{customer},</if>
<if test="oldQuantity != null">old_quantity = #{oldQuantity},</if>
<if test="newQuantity != null">new_quantity = #{newQuantity},</if>
<if test="recordType != null">record_type = #{recordType},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
</trim>
where check_guid = #{checkGuid}
</update>
<delete id="deleteCheckDifferenceRecordByCheckGuid" parameterType="String">
delete from check_difference_record where check_guid = #{checkGuid}
</delete>
<delete id="deleteCheckDifferenceRecordByCheckGuids" parameterType="String">
delete from check_difference_record where check_guid in
<foreach item="checkGuid" collection="array" open="(" separator="," close=")">
#{checkGuid}
</foreach>
</delete>
</mapper>

77
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.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.in.stockindetailfinish.mapper.InStockinDetailFinishMapper">
<resultMap type="InStockinDetailFinish" id="InStockinDetailFinishResult">
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockinGuid" column="stockin_guid" />
@@ -36,14 +36,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
</resultMap>
<resultMap type="InStockinDetail" id="InStockinDetailResult">
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockinGuid" column="stockin_guid" />
<result property="stockinId" column="stockin_id" />
<result property="lotNo" column="lot_no" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="quantity" column="quantity" />
<result property="quantityX" column="quantity_x" />
<result property="quantityJ" column="quantity_j" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="remark" column="remark" />
<result property="assignNum" column="assign_num" />
<result property="assignNumX" column="assign_num_x" />
<result property="assignNumJ" column="assign_num_j" />
<result property="printDate" column="print_date" />
<result property="stockStatus" column="stock_status" />
<result property="supplierId" column="supplier_id" />
<result property="customerId" column="customer_id" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<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="scanNum" column="scan_num" />
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
</resultMap>
<sql id="selectInStockinDetailFinishVo">
select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from in_stockin_detail_finish
</sql>
<select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">
<include refid="selectInStockinDetailFinishVo"/>
<where>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -74,11 +105,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
</where>
</select>
<select id="selectInStockinDetailFinishByStockinDetailId" parameterType="String" resultMap="InStockinDetailFinishResult">
<include refid="selectInStockinDetailFinishVo"/>
where stockin_detail_id = #{stockinDetailId}
</select>
<select id="selectInStockinDetailFinishListByInStockinDetail"
resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</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="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</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="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>
</where>
</select>
<insert id="insertInStockinDetailFinish" parameterType="InStockinDetailFinish">
insert into in_stockin_detail_finish
@@ -189,9 +254,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteInStockinDetailFinishByStockinDetailIds" parameterType="String">
delete from in_stockin_detail_finish where stockin_detail_id in
delete from in_stockin_detail_finish where stockin_detail_id in
<foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
#{stockinDetailId}
</foreach>
</delete>
</mapper>
</mapper>

127
ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.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.in.stockinfinish.mapper.InStockinFinishMapper">
<resultMap type="InStockinFinish" id="InStockinFinishResult">
<result property="stockinGuid" column="stockin_guid" />
<result property="stockinId" column="stockin_id" />
@@ -26,37 +26,112 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare5" column="spare5" />
</resultMap>
<resultMap type="InStockin" id="InStockinResult">
<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="createManName" column="user_name" />
<result property="status" column="status" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<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="departmentName" column="dept_name" />
<result property="customerNo" column="customer_no" />
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
<result property="supplierName" column="supplier_name" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare4" column="spare4" />
<result property="spare3" column="spare3" />
<result property="spare5" column="spare5" />
</resultMap>
<sql id="selectInStockinFinishVo">
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from in_stockin_finish
</sql>
select is2.stockin_guid,
is2.stockin_id,
is2.in_type,
is2.create_date,
is2.create_man_id,
is2.status,
is2.warehouse_id,
is2.finish_date,
is2.erp_bill,
is2.stock_source,
is2.department_no,
is2.customer_no,
is2.class_no,
is2.supplier_no,
is2.spare1,
is2.spare2,
is2.spare4,
is2.spare3,
is2.spare5,
bw.warehouse_name,
bs.supplier_name,
sd.dept_name ,
su.user_name
from in_stockin_finish is2
left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
left join bas_supplier bs on bs.supplier_no = is2.supplier_no
left join sys_dept sd on is2.department_no = sd.dept_id
left join sys_user su on su.user_id = is2.create_man_id</sql>
<select id="selectInStockinFinishList" parameterType="InStockinFinish" resultMap="InStockinFinishResult">
<include refid="selectInStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</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>
<where>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and is2.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and is2.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and is2.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and is2.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
</where>
</select>
<select id="selectInStockinFinishByStockinGuid" parameterType="String" resultMap="InStockinFinishResult">
<include refid="selectInStockinFinishVo"/>
where stockin_guid = #{stockinGuid}
where is2.stockin_guid = #{stockinGuid}
</select>
<select id="selectInStockinFinishListByInStockin" resultMap="InStockinResult">
<include refid="selectInStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and is2.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and is2.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and is2.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and is2.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
</where>
</select>
<insert id="insertInStockinFinish" parameterType="InStockinFinish">
@@ -135,9 +210,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteInStockinFinishByStockinGuids" parameterType="String">
delete from in_stockin_finish where stockin_guid in
delete from in_stockin_finish where stockin_guid in
<foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
#{stockinGuid}
</foreach>
</delete>
</mapper>
</mapper>

71
ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
View File

@@ -10,15 +10,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inType" column="in_type" />
<result property="createDate" column="create_date" />
<result property="createManId" column="create_man_id" />
<result property="createManName" column="user_name" />
<result property="status" column="status" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<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="departmentName" column="dept_name" />
<result property="customerNo" column="customer_no" />
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
<result property="supplierName" column="supplier_name" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare4" column="spare4" />
@@ -27,36 +31,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectInStockinVo">
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare4, spare3, spare5 from in_stockin
select is2.stockin_guid,
is2.stockin_id,
is2.in_type,
is2.create_date,
is2.create_man_id,
is2.status,
is2.warehouse_id,
is2.finish_date,
is2.erp_bill,
is2.stock_source,
is2.department_no,
is2.customer_no,
is2.class_no,
is2.supplier_no,
is2.spare1,
is2.spare2,
is2.spare4,
is2.spare3,
is2.spare5,
bw.warehouse_name,
bs.supplier_name,
sd.dept_name ,
su.user_name
from in_stockin is2
left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
left join bas_supplier bs on bs.supplier_no = is2.supplier_no
left join sys_dept sd on is2.department_no = sd.dept_id
left join sys_user su on su.user_id = is2.create_man_id
</sql>
<select id="selectInStockinList" parameterType="InStockin" resultMap="InStockinResult">
<include refid="selectInStockinVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and is2.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and is2.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and is2.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and is2.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 = #{spare2}</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
</where>
</select>
<select id="selectInStockinByStockinGuid" parameterType="String" resultMap="InStockinResult">
<include refid="selectInStockinVo"/>
where stockin_guid = #{stockinGuid}
where is2.stockin_guid = #{stockinGuid}
</select>
<insert id="insertInStockin" parameterType="InStockin">

4
ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
View File

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="targetCargoSpaceName" column="target_cargo_space_name" />
<result property="warehouseName" column="warehouse_name" />
<result property="departmentName" column="dept_name" />
</resultMap>
<sql id="selectMydoJobVo">
@@ -45,13 +46,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
bs.supplier_name as supplier_name, bc.customer_name as customer_name,
bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
bw.warehouse_name as warehouse_name
bw.warehouse_name as warehouse_name,sd.dept_name
from mydo_job mj
left join bas_supplier bs on mj.supplier_id = bs.id
left join bas_customer bc on mj.customer_id = bc.id
left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
left join sys_dept sd on mj.department_id = sd.dept_id
</sql>

70
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.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.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper">
<resultMap type="ReceiveStockinDetailFinish" id="ReceiveStockinDetailFinishResult">
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockinGuid" column="stockin_guid" />
@@ -33,6 +33,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
</resultMap>
<resultMap type="ReceiveStockinDetail" id="ReceiveStockinDetailResult">
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockinGuid" column="stockin_guid" />
<result property="stockinId" column="stockin_id" />
<result property="lotNo" column="lot_no" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="quantity" column="quantity" />
<result property="quantityX" column="quantity_x" />
<result property="quantityJ" column="quantity_j" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="remark" column="remark" />
<result property="assignNum" column="assign_num" />
<result property="assignNumX" column="assign_num_x" />
<result property="assignNumJ" column="assign_num_j" />
<result property="printDate" column="print_date" />
<result property="stockStatus" column="stock_status" />
<result property="supplierId" column="supplier_id" />
<result property="customerId" column="customer_id" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<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" />
</resultMap>
<sql id="selectReceiveStockinDetailFinishVo">
select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6 from receive_stockin_detail_finish
@@ -40,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinDetailFinishList" parameterType="ReceiveStockinDetailFinish" resultMap="ReceiveStockinDetailFinishResult">
<include refid="selectReceiveStockinDetailFinishVo"/>
<where>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -68,11 +97,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where>
</select>
<select id="selectReceiveStockinDetailFinishByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailFinishResult">
<include refid="selectReceiveStockinDetailFinishVo"/>
where stockin_detail_id = #{stockinDetailId}
</select>
<select id="selectReceiveStockinDetailList"
resultMap="ReceiveStockinDetailResult">
<include refid="selectReceiveStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</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="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</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>
</where>
</select>
<insert id="insertReceiveStockinDetailFinish" parameterType="ReceiveStockinDetailFinish">
insert into receive_stockin_detail_finish
@@ -174,9 +234,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteReceiveStockinDetailFinishByStockinDetailIds" parameterType="String">
delete from receive_stockin_detail_finish where stockin_detail_id in
delete from receive_stockin_detail_finish where stockin_detail_id in
<foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
#{stockinDetailId}
</foreach>
</delete>
</mapper>
</mapper>

124
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.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.receive.stockinfinish.mapper.ReceiveStockinFinishMapper">
<resultMap type="ReceiveStockinFinish" id="ReceiveStockinFinishResult">
<result property="stockinGuid" column="stockin_guid" />
<result property="stockinId" column="stockin_id" />
@@ -25,39 +25,115 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
</resultMap>
<resultMap type="ReceiveStockin" id="ReceiveStockinResult">
<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="createManName" column="user_name" />
<result property="status" column="status" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="spare5" column="spare5" />
<result property="spare4" column="spare4" />
<result property="spare3" column="spare3" />
<result property="finishDate" column="finish_date" />
<result property="spare2" column="spare2" />
<result property="spare1" column="spare1" />
<result property="erpBill" column="erp_bill" />
<result property="stockSource" column="stock_source" />
<result property="departmentNo" column="department_no" />
<result property="departmentName" column="dept_name" />
<result property="customerNo" column="customer_no" />
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
<result property="supplierName" column="supplier_name" />
</resultMap>
<sql id="selectReceiveStockinFinishVo">
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from receive_stockin_finish
select
rs.stockin_guid ,
rs.stockin_id ,
rs.in_type ,
rs.create_date ,
rs.create_man_id ,
rs.status ,
rs.warehouse_id ,
bw.warehouse_name ,
rs.spare5 ,
rs.spare4 ,
rs.spare3 ,
rs.finish_date ,
rs.spare2 ,
rs.spare1,
rs.erp_bill ,
rs.stock_source,
rs.department_no,
rs.customer_no,
rs.class_no,
rs.supplier_no,
bs.supplier_name,
sd.dept_name,
su.user_name
from receive_stockin_finish rs
left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id
left join bas_supplier bs on rs.supplier_no = bs.supplier_no
left join sys_dept sd on rs.department_no = sd.dept_id
left join sys_user su on su.user_id = rs.create_man_id
</sql>
<select id="selectReceiveStockinFinishList" parameterType="ReceiveStockinFinish" resultMap="ReceiveStockinFinishResult">
<include refid="selectReceiveStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<where>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and rs.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and rs.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and rs.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and rs.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
</where>
</select>
<select id="selectReceiveStockinFinishByStockinGuid" parameterType="String" resultMap="ReceiveStockinFinishResult">
<include refid="selectReceiveStockinFinishVo"/>
where stockin_guid = #{stockinGuid}
</select>
<select id="selectReceiveStockinList" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and rs.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and rs.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and rs.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and rs.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
</where>
</select>
<insert id="insertReceiveStockinFinish" parameterType="ReceiveStockinFinish">
insert into receive_stockin_finish
@@ -135,9 +211,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteReceiveStockinFinishByStockinGuids" parameterType="String">
delete from receive_stockin_finish where stockin_guid in
delete from receive_stockin_finish where stockin_guid in
<foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
#{stockinGuid}
</foreach>
</delete>
</mapper>
</mapper>

73
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml
View File

@@ -10,8 +10,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inType" column="in_type" />
<result property="createDate" column="create_date" />
<result property="createManId" column="create_man_id" />
<result property="createManName" column="user_name" />
<result property="status" column="status" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="spare5" column="spare5" />
<result property="spare4" column="spare4" />
<result property="spare3" column="spare3" />
@@ -21,42 +23,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="erpBill" column="erp_bill" />
<result property="stockSource" column="stock_source" />
<result property="departmentNo" column="department_no" />
<result property="departmentName" column="dept_name" />
<result property="customerNo" column="customer_no" />
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
<result property="supplierName" column="supplier_name" />
</resultMap>
<sql id="selectReceiveStockinVo">
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from receive_stockin
select
rs.stockin_guid ,
rs.stockin_id ,
rs.in_type ,
rs.create_date ,
rs.create_man_id ,
rs.status ,
rs.warehouse_id ,
bw.warehouse_name ,
rs.spare5 ,
rs.spare4 ,
rs.spare3 ,
rs.finish_date ,
rs.spare2 ,
rs.spare1,
rs.erp_bill ,
rs.stock_source,
rs.department_no,
rs.customer_no,
rs.class_no,
rs.supplier_no,
bs.supplier_name,
sd.dept_name,
su.user_name
from receive_stockin rs
left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id
left join bas_supplier bs on rs.supplier_no = bs.supplier_no
left join sys_dept sd on rs.department_no = sd.dept_id
left join sys_user su on su.user_id = rs.create_man_id
</sql>
<select id="selectReceiveStockinList" parameterType="ReceiveStockin" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and rs.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and rs.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and rs.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and rs.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
</where>
</select>
<select id="selectReceiveStockinByStockinGuid" parameterType="String" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinVo"/>
where stockin_guid = #{stockinGuid}
where rs.stockin_guid = #{stockinGuid}
</select>
<insert id="insertReceiveStockin" parameterType="ReceiveStockin">

31
ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java
View File

@@ -4,9 +4,12 @@ import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
import com.ruoyi.common.utils.spring.SpringUtils;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 获取i18n资源文件
*
*
* @author ruoyi
*/
public class MessageUtils
@@ -23,4 +26,30 @@ public class MessageUtils
MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
}
/**
* 解析 ${}中括号中的值
*
* @param input 包含 ${} 占位符的字符串
* @return 解析后的值（如果国际化文件中不存在对应的value，则会返回Key）
*/
public static String parseMessage(String input)
{
// 匹配 ${} 占位符的正则表达式
Pattern pattern = Pattern.compile("\\$\\{([^\\}]+)\\}");
Matcher matcher = pattern.matcher(input);
StringBuffer result = new StringBuffer();
// 逐个匹配并替换 ${} 中的值
while (matcher.find())
{
String key = matcher.group(1); // 匹配到的括号中的值
// tag 国际化
String replacement = MessageUtils.message(key);
// 替换占位符
matcher.appendReplacement(result, replacement);
}
// 处理剩余部分
matcher.appendTail(result);
return result.toString();
}
}

74
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

@@ -24,6 +24,8 @@ import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.MessageUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.RegExUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
@@ -88,7 +90,7 @@ import com.ruoyi.common.utils.reflect.ReflectUtils;
/**
* Excel相关处理
*
*
* @author ruoyi
*/
public class ExcelUtil<T>
@@ -307,7 +309,7 @@ public class ExcelUtil<T>
/**
* 对excel表单默认第一个索引名转换成list
*
*
* @param is 输入流
* @return 转换后集合
*/
@@ -318,7 +320,7 @@ public class ExcelUtil<T>
/**
* 对excel表单默认第一个索引名转换成list
*
*
* @param is 输入流
* @param titleNum 标题占用行数
* @return 转换后集合
@@ -344,7 +346,7 @@ public class ExcelUtil<T>
/**
* 对excel表单指定表格索引名转换成list
*
*
* @param sheetName 表格索引名
* @param titleNum 标题占用行数
* @param is 输入流
@@ -527,7 +529,7 @@ public class ExcelUtil<T>
/**
* 对list数据源将其里面的数据导入到excel表单
*
*
* @param list 导出数据集合
* @param sheetName 工作表的名称
* @return 结果
@@ -539,7 +541,7 @@ public class ExcelUtil<T>
/**
* 对list数据源将其里面的数据导入到excel表单
*
*
* @param list 导出数据集合
* @param sheetName 工作表的名称
* @param title 标题
@@ -553,7 +555,7 @@ public class ExcelUtil<T>
/**
* 对list数据源将其里面的数据导入到excel表单
*
*
* @param response 返回数据
* @param list 导出数据集合
* @param sheetName 工作表的名称
@@ -566,7 +568,7 @@ public class ExcelUtil<T>
/**
* 对list数据源将其里面的数据导入到excel表单
*
*
* @param response 返回数据
* @param list 导出数据集合
* @param sheetName 工作表的名称
@@ -583,7 +585,7 @@ public class ExcelUtil<T>
/**
* 对list数据源将其里面的数据导入到excel表单
*
*
* @param sheetName 工作表的名称
* @return 结果
*/
@@ -594,7 +596,7 @@ public class ExcelUtil<T>
/**
* 对list数据源将其里面的数据导入到excel表单
*
*
* @param sheetName 工作表的名称
* @param title 标题
* @return 结果
@@ -607,7 +609,7 @@ public class ExcelUtil<T>
/**
* 对list数据源将其里面的数据导入到excel表单
*
*
* @param sheetName 工作表的名称
* @return 结果
*/
@@ -618,7 +620,7 @@ public class ExcelUtil<T>
/**
* 对list数据源将其里面的数据导入到excel表单
*
*
* @param sheetName 工作表的名称
* @param title 标题
* @return 结果
@@ -633,7 +635,7 @@ public class ExcelUtil<T>
/**
* 对list数据源将其里面的数据导入到excel表单
*
*
* @return 结果
*/
public void exportExcel(HttpServletResponse response)
@@ -655,7 +657,7 @@ public class ExcelUtil<T>
/**
* 对list数据源将其里面的数据导入到excel表单
*
*
* @return 结果
*/
public AjaxResult exportExcel()
@@ -723,7 +725,7 @@ public class ExcelUtil<T>
/**
* 填充excel数据
*
*
* @param index 序号
* @param row 单元格行
*/
@@ -821,7 +823,7 @@ public class ExcelUtil<T>
/**
* 创建表格样式
*
*
* @param wb 工作薄对象
* @return 样式列表
*/
@@ -876,7 +878,7 @@ public class ExcelUtil<T>
/**
* 根据Excel注解创建表格头样式
*
*
* @param wb 工作薄对象
* @return 自定义样式列表
*/
@@ -912,7 +914,7 @@ public class ExcelUtil<T>
/**
* 根据Excel注解创建表格列样式
*
*
* @param wb 工作薄对象
* @return 自定义样式列表
*/
@@ -944,7 +946,7 @@ public class ExcelUtil<T>
/**
* 根据Excel注解创建表格列样式
*
*
* @param styles 自定义样式列表
* @param field 属性列信息
* @param excel 注解信息
@@ -991,6 +993,8 @@ public class ExcelUtil<T>
Cell cell = row.createCell(column);
// 写入列信息
cell.setCellValue(attr.name());
// 国际化
//cell.setCellValue(MessageUtils.parseMessage(attr.name()));
setDataValidation(attr, row, column);
cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
if (isSubList())
@@ -1007,7 +1011,7 @@ public class ExcelUtil<T>
/**
* 设置单元格信息
*
*
* @param value 单元格值
* @param attr 注解相关
* @param cell 单元格信息
@@ -1193,7 +1197,7 @@ public class ExcelUtil<T>
/**
* 设置 POI XSSFSheet 单元格提示或选择框
*
*
* @param sheet 表单
* @param textlist 下拉框显示的内容
* @param promptContent 提示内容
@@ -1230,7 +1234,7 @@ public class ExcelUtil<T>
/**
* 设置某些列的值只能输入预制的数据,显示下拉框（兼容超出一定数量的下拉框）.
*
*
* @param sheet 要设置的sheet.
* @param textlist 下拉框显示的内容
* @param promptContent 提示内容
@@ -1282,7 +1286,7 @@ public class ExcelUtil<T>
/**
* 解析导出值 0=男,1=女,2=未知
*
*
* @param propertyValue 参数值
* @param converterExp 翻译注解
* @param separator 分隔符
@@ -1319,7 +1323,7 @@ public class ExcelUtil<T>
/**
* 反向解析值 男=0,女=1,未知=2
*
*
* @param propertyValue 参数值
* @param converterExp 翻译注解
* @param separator 分隔符
@@ -1356,7 +1360,7 @@ public class ExcelUtil<T>
/**
* 解析字典值
*
*
* @param dictValue 字典值
* @param dictType 字典类型
* @param separator 分隔符
@@ -1369,7 +1373,7 @@ public class ExcelUtil<T>
/**
* 反向解析值字典值
*
*
* @param dictLabel 字典标签
* @param dictType 字典类型
* @param separator 分隔符
@@ -1382,7 +1386,7 @@ public class ExcelUtil<T>
/**
* 数据处理器
*
*
* @param value 数据值
* @param excel 数据注解
* @return
@@ -1458,7 +1462,7 @@ public class ExcelUtil<T>
/**
* 获取下载路径
*
*
* @param filename 文件名称
*/
public String getAbsoluteFile(String filename)
@@ -1474,7 +1478,7 @@ public class ExcelUtil<T>
/**
* 获取bean中的属性值
*
*
* @param vo 实体对象
* @param field 字段
* @param excel 注解
@@ -1506,7 +1510,7 @@ public class ExcelUtil<T>
/**
* 以类的属性的get方法方法形式获取值
*
*
* @param o
* @param name
* @return value
@@ -1649,7 +1653,7 @@ public class ExcelUtil<T>
/**
* 创建工作表
*
*
* @param sheetNo sheet数量
* @param index 序号
*/
@@ -1666,7 +1670,7 @@ public class ExcelUtil<T>
/**
* 获取单元格值
*
*
* @param row 获取的行
* @param column 获取单元格列号
* @return 单元格值
@@ -1726,7 +1730,7 @@ public class ExcelUtil<T>
/**
* 判断是否是空行
*
*
* @param row 判断的行
* @return
*/
@@ -1807,7 +1811,7 @@ public class ExcelUtil<T>
/**
* 格式化不同类型的日期对象
*
*
* @param dateFormat 日期格式
* @param val 被格式化的日期对象
* @return 格式化后的日期字符
@@ -1873,7 +1877,7 @@ public class ExcelUtil<T>
/**
* 获取对象的子列表方法
*
*
* @param name 名称
* @param pojoClass 类对象
* @return 子列表方法

44
ruoyi-ui/src/api/check/difference.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询盘点差异列表
export function listDifference(query) {
return request({
url: '/check/difference/list',
method: 'get',
params: query
})
}
// 查询盘点差异详细
export function getDifference(checkGuid) {
return request({
url: '/check/difference/' + checkGuid,
method: 'get'
})
}
// 新增盘点差异
export function addDifference(data) {
return request({
url: '/check/difference',
method: 'post',
data: data
})
}
// 修改盘点差异
export function updateDifference(data) {
return request({
url: '/check/difference',
method: 'put',
data: data
})
}
// 删除盘点差异
export function delDifference(checkGuid) {
return request({
url: '/check/difference/' + checkGuid,
method: 'delete'
})
}

8
ruoyi-ui/src/api/in/stockInDetail.js
View File

@@ -42,3 +42,11 @@ export function delStockInDetail(stockinDetailId) {
method: 'delete'
})
}
export function barcodePrinting(data) {
return request({
url: '/in/stockInDetail/barcodePrinting',
method: 'post',
data:data
})
}

295
ruoyi-ui/src/views/check/create/index.vue Normal file
View File

@@ -0,0 +1,295 @@
<template>
<div class="app-container">
<!-- 主表信息录入 -->
<el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
<el-form-item label="仓库" prop="warehouseId" required>
<el-select v-model="formData.warehouseId" placeholder="请选择仓库" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
:label="dict.warehouseName"
:value="dict.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item label="客户" prop="customerNo" required>
<el-input
v-model="formData.customerNo"
placeholder="请输入客户编号"
clearable
/>
</el-form-item>
<el-form-item label="单据类型" prop="outType" required>
<el-select v-model="formData.outType" placeholder="请选择单据类型" clearable>
<el-option
v-for="dict in dict.type.out_bill_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">重置</el-button>
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">保存单据</el-button>
</el-form-item>
</el-form>
<div class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">选择物资</el-button>
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">重新建单</el-button>
</div>
<!-- 物资明细表格 -->
<el-table v-loading="loading" :data="materialList">
<el-table-column label="物资编号" align="center" prop="productId" />
<el-table-column label="物资名称" align="center" prop="productName" />
<el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="数量" align="center" prop="quantity">
<template slot-scope="scope">
<el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 选择物资弹窗 -->
<el-dialog title="选择物资" :visible.sync="materialDialog" width="800px" append-to-body>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="物资编码" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物资编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物资名称" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入物资名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
clearable
@keyup.enter.native="handleQuery"
/>
</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>
</el-form-item>
</el-form>
<el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="物资编码" align="center" prop="productId" />
<el-table-column label="物资名称" align="center" prop="productName" />
<el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="数量" align="center" prop="quantity" />
<!-- <el-table-column label="仓库" align="center" prop="warehouseId" /> -->
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelectMaterials">确 定</el-button>
<el-button @click="cancelSelectMaterials">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listProductAndStock,saveOutStock } from "@/api/out/outStockout";
import {listWarehouse} from "@/api/bas/warehouse";
export default {
name: "AddOutStock",
dicts: ['out_bill_type', 'bill_status'],
data() {
return {
// 遮罩层
loading: false,
materialLoading: false,
// 表单验证规则
rules: {
warehouseId: [
{ required: true, message: "请选择仓库", trigger: "change" }
],
customerNo: [
{ required: true, message: "请输入客户编号", trigger: "blur" }
],
billType: [
{ required: true, message: "请选择单据类型", trigger: "change" }
]
},
// 主表数据
formData: {
warehouseId: null,
customerNo: null,
outType: null
},
// 仓库选项
warehouseOptions: [],
// 物资明细列表
materialList: [],
// 选择物资弹窗
materialDialog: false,
// 物资选项数据
materialOptions: [],
// 已选择的物资
selectedMaterials: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
onlyIdentity: null,
productId: null,
lotNo: null,
productName: null,
quantity: null,
warehouseId: null
}
};
},
created() {
this.getWarehouseOptions();
},
methods: {
/** 获取仓库选项 */
getWarehouseOptions() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
});
},
/** 打开选择物资弹窗 */
handleSelectMaterials() {
this.materialDialog = true;
this.getMaterialList();
},
/** 获取物资列表 */
getMaterialList() {
this.materialLoading = true;
listProductAndStock(this.queryParams).then(response => {
this.materialOptions = response.rows;
this.materialLoading = false;
});
},
/** 物资选择变更 */
handleSelectionChange(selection) {
this.selectedMaterials = selection;
},
/** 确认选择物资 */
confirmSelectMaterials() {
if (this.selectedMaterials.length === 0) {
this.$modal.msgError("请选择物资");
return;
}
// 过滤掉已经存在的物资
const newMaterials = this.selectedMaterials.filter(item => {
return !this.materialList.some(existing => existing.onlyIdentity === item.onlyIdentity);
});
if (newMaterials.length === 0) {
this.$modal.msgWarning("所选物资已存在，请重新选择");
return;
}
this.materialList = this.materialList.concat(
newMaterials.map(item => ({
productId: item.productId,
productName: item.productName,
quantity: item.quantity,
quantityOrignal: item.quantity,
lotNo: item.lotNo,
onlyIdentity: item.onlyIdentity
}))
);
this.materialDialog = false;
this.selectedMaterials = [];
},
/** 取消选择物资 */
cancelSelectMaterials() {
this.selectedMaterials = [];
this.materialDialog = false;
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getMaterialList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 删除物资 */
handleDelete(index) {
this.materialList.splice(index, 1);
},
/** 数量变更 */
handleQuantityChange(row) {
// 如果没有初始数量，则设置初始数量
// 如果修改后的数量大于初始数量，给出提示并重置为当前值
if (row.quantity > row.quantityOrignal) {
this.$modal.msgError("数量不能大于库存数量");
row.quantity = row.quantityOrignal;
}
},
/** 保存单据 */
handleSave() {
this.$refs.formRef.validate(valid => {
if (valid) {
if (this.materialList.length === 0) {
this.$modal.msgError("请选择物资");
return;
}
const data = {
outStockout: this.formData,
detailList: this.materialList
};
// 这里需要调用保存接口
saveOutStock(data).then(response => {
console.log(response)
this.$modal.msgSuccess("单据"+response.msg+"保存成功");
this.$tab.refreshPage(this.$route);
// this.reset();
});
}
});
},
/** 重置数据 */
reset() {
this.formData = {
warehouseId: null,
customerNo: null,
outType: null
};
this.materialList = [];
},
/** 重新建单 */
handleReload() {
this.$tab.refreshPage(this.$route);
}
}
};
</script>

389
ruoyi-ui/src/views/check/difference/index.vue Normal file
View File

@@ -0,0 +1,389 @@
<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="盘点单据id" prop="checkStockDetailId">
<el-input
v-model="queryParams.checkStockDetailId"
placeholder="请输入盘点单据id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存id" prop="stockId">
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位id" prop="cargoSpaceId">
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料id" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="供应商" prop="supplier">
<el-input
v-model="queryParams.supplier"
placeholder="请输入供应商"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户" prop="customer">
<el-input
v-model="queryParams.customer"
placeholder="请输入客户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="原值" prop="oldQuantity">
<el-input
v-model="queryParams.oldQuantity"
placeholder="请输入原值"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="新值" prop="newQuantity">
<el-input
v-model="queryParams.newQuantity"
placeholder="请输入新值"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="物料guid" prop="productGuid">
<el-input
v-model="queryParams.productGuid"
placeholder="请输入物料guid"
clearable
@keyup.enter.native="handleQuery"
/>
</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>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['check:difference:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['check:difference:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['check:difference:remove']"
>删除</el-button>
</el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['check:difference:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="differenceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="盘点id" align="center" prop="checkGuid" />
<el-table-column label="盘点单据id" align="center" prop="checkStockDetailId" />
<el-table-column label="库存id" align="center" prop="stockId" />
<el-table-column label="托盘" align="center" prop="trayCode" />
<el-table-column label="货位id" align="center" prop="cargoSpaceId" />
<el-table-column label="物料id" align="center" prop="productId" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="供应商" align="center" prop="supplier" />
<el-table-column label="客户" align="center" prop="customer" />
<el-table-column label="原值" align="center" prop="oldQuantity" />
<el-table-column label="新值" align="center" prop="newQuantity" />
<el-table-column label="操作方式" align="center" prop="recordType" />
<el-table-column label="物料guid" align="center" prop="productGuid" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['check:difference:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['check:difference:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改盘点差异对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="盘点单据id" prop="checkStockDetailId">
<el-input v-model="form.checkStockDetailId" placeholder="请输入盘点单据id" />
</el-form-item>
<el-form-item label="库存id" prop="stockId">
<el-input v-model="form.stockId" placeholder="请输入库存id" />
</el-form-item>
<el-form-item label="托盘" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘" />
</el-form-item>
<el-form-item label="货位id" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位id" />
</el-form-item>
<el-form-item label="物料id" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料id" />
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />
</el-form-item>
<el-form-item label="供应商" prop="supplier">
<el-input v-model="form.supplier" placeholder="请输入供应商" />
</el-form-item>
<el-form-item label="客户" prop="customer">
<el-input v-model="form.customer" placeholder="请输入客户" />
</el-form-item>
<el-form-item label="原值" prop="oldQuantity">
<el-input v-model="form.oldQuantity" placeholder="请输入原值" />
</el-form-item>
<el-form-item label="新值" prop="newQuantity">
<el-input v-model="form.newQuantity" placeholder="请输入新值" />
</el-form-item>
<el-form-item label="物料guid" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料guid" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listDifference, getDifference, delDifference, addDifference, updateDifference } from "@/api/check/difference"
export default {
name: "Difference",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 盘点差异表格数据
differenceList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
checkStockDetailId: null,
stockId: null,
trayCode: null,
cargoSpaceId: null,
productId: null,
lotNo: null,
supplier: null,
customer: null,
oldQuantity: null,
newQuantity: null,
recordType: null,
productGuid: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
}
},
created() {
this.getList()
},
methods: {
/** 查询盘点差异列表 */
getList() {
this.loading = true
listDifference(this.queryParams).then(response => {
this.differenceList = response.rows
this.total = response.total
this.loading = false
})
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
this.form = {
checkGuid: null,
checkStockDetailId: null,
stockId: null,
trayCode: null,
cargoSpaceId: null,
productId: null,
lotNo: null,
supplier: null,
customer: null,
oldQuantity: null,
newQuantity: null,
recordType: null,
createTime: null,
productGuid: null
}
this.resetForm("form")
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm")
this.handleQuery()
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.checkGuid)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = "添加盘点差异"
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const checkGuid = row.checkGuid || this.ids
getDifference(checkGuid).then(response => {
this.form = response.data
this.open = true
this.title = "修改盘点差异"
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.checkGuid != null) {
updateDifference(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
} else {
addDifference(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const checkGuids = row.checkGuid || this.ids
this.$modal.confirm('是否确认删除盘点差异编号为"' + checkGuids + '"的数据项？').then(function() {
return delDifference(checkGuids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
},
/** 导出按钮操作 */
handleExport() {
this.download('check/difference/export', {
...this.queryParams
}, `difference_${new Date().getTime()}.xlsx`)
}
}
}
</script>

6
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -263,7 +263,7 @@
<el-table-column label="任务号" align="center" prop="taskNo" />
<el-table-column label="供应商" align="center" prop="supplierName" key="supplierId" value="supplierName" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="部门ID" align="center" prop="departmentId" />
<el-table-column label="部门" align="center" prop="departmentName" />
<el-table-column label="托盘码" align="center" prop="trayCode" />
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
<el-table-column label="货位" align="center" prop="cargoSpaceName" />
@@ -389,7 +389,7 @@ export default {
pageNum: 1,
pageSize: 10,
jobId: null,
status: 1,
status: '1',
onLineType: null,
taskNo: null,
supplierId: null,
@@ -404,7 +404,7 @@ export default {
workshopId: null,
priority: null,
executionPhase: null,
inOrOut: null,
inOrOut: '1',
createTime: null,
startTime: null,
finishTime: null,

14
ruoyi-ui/src/views/in/receive/add/index.vue
View File

@@ -23,9 +23,9 @@
<el-select v-model="form.supplierId" :placeholder="$t('receiveStockinAdd.selectSupplier')">
<el-option
v-for="item in supplierOptions"
:key="item.supplierNo"
:key="item.id"
:label="item.simpleName"
:value="item.id"
:value="item.supplierNo"
/>
</el-select>
</el-form-item>
@@ -120,7 +120,7 @@
icon="el-icon-delete"
@click="handleDeleteProduct(scope.$index)"
>{{ $t('receiveStockinAdd.delete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -193,6 +193,7 @@ import {addStockin} from "@/api/receive/stockin";
import {listBasProduct} from "@/api/bas/BasProduct";
import {listBasSupplier} from "@/api/bas/BasSupplier";
import { getToken } from "@/utils/auth"
import {listWarehouse} from "@/api/bas/warehouse"
export default {
@@ -221,10 +222,7 @@ export default {
},
// 仓库选项
warehouseOptions: [
{warehouseId: 1, warehouseName: "主仓库"},
{warehouseId: 2, warehouseName: "次仓库"}
],
warehouseOptions: [],
// 供应商选项
supplierOptions: [],
// 物料列表
@@ -266,7 +264,7 @@ export default {
};
},
created() {
//this.getWarehouseList();
this.getWarehouseList();
this.getSupplierList();
console.log(this.supplierOptions)
},

78
ruoyi-ui/src/views/in/receive/index.vue
View File

@@ -125,12 +125,34 @@
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-input
<el-select
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
placeholder="请选择仓库"
clearable
@keyup.enter.native="handleQuery"
/>
@change="handleQuery"
>
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择单据状态"
clearable
@change="handleQuery"
>
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -194,9 +216,13 @@
<el-table-column label="入库订单ID" align="center" prop="stockinId"/>
<el-table-column label="入库类型" align="center" prop="inType"/>
<el-table-column label="建立时间" align="center" prop="createDate"/>
<el-table-column label="创建人" align="center" prop="createManId"/>
<el-table-column label="单据状态" align="center" prop="status"/>
<el-table-column label="仓库ID" align="center" prop="warehouseId"/>
<el-table-column label="创建人" align="center" prop="createManName"/>
<el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="仓库" align="center" prop="warehouseName"/>
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />
<el-table-column label="备用字段4" align="center" prop="spare4" />
<el-table-column label="备用字段3" align="center" prop="spare3" />-->
@@ -205,10 +231,10 @@
<el-table-column label="备用字段1" align="center" prop="spare1" />-->
<el-table-column label="erp单号" align="center" prop="erpBill"/>
<el-table-column label="单据来源" align="center" prop="stockSource"/>
<el-table-column label="部门编码" align="center" prop="departmentNo"/>
<el-table-column label="部门" align="center" prop="departmentName"/>
<!-- <el-table-column label="客户编码" align="center" prop="customerNo"/>-->
<el-table-column label="班组编码" align="center" prop="classNo"/>
<el-table-column label="供应商编码" align="center" prop="supplierNo"/>
<el-table-column label="供应商" align="center" prop="supplierName"/>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -289,7 +315,11 @@
<el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
<el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />-->
<!-- <el-table-column label="入库日期" align="center" prop="printDate"/>-->
<el-table-column label="单据状态" align="center" prop="stockStatus"/>
<el-table-column label="单据状态" align="center" prop="stockStatus">
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<!-- <el-table-column label="供应商编码" align="center" prop="supplierId"/>-->
<!-- <el-table-column label="客户编码" align="center" prop="customerId"/>-->
<el-table-column label="单位" align="center" prop="unit"/>
@@ -336,11 +366,18 @@
<script>
import {listStockin, getStockin, delStockin, addStockin, updateStockin, createStockin} from "@/api/receive/stockin"
import {listStockInDetail, delStockInDetail,qualityInspection} from "@/api/receive/stockInDetail"
import {listWarehouse} from "@/api/bas/warehouse"
import { getDicts } from "@/api/system/dict/data"
export default {
name: "Stockin",
dicts: ['receive_bill_status'],
data() {
return {
// 仓库选项列表
warehouseOptions: [],
// 单据状态字典
statusOptions: [],
// 遮罩层
loading: true,
detailLoading: true,
@@ -372,7 +409,7 @@ export default {
inType: null,
createDate: null,
createManId: null,
status: null,
status: '0',
warehouseId: null,
spare5: null,
spare4: null,
@@ -413,6 +450,8 @@ export default {
},
created() {
this.getList()
this.getWarehouseList()
this.getDictList()
},
methods: {
/** 查询收货单据列表 */
@@ -506,6 +545,7 @@ export default {
getDetailList(stockinId) {
this.detailLoading = true;
this.queryDetailParams.stockinId = stockinId;
this.queryDetailParams.status = this.queryParams.status;
listStockInDetail(this.queryDetailParams).then(response => {
this.stockInDetailList = response.rows;
this.detailTotal = response.total;
@@ -573,6 +613,22 @@ export default {
this.getList()
})
},
/** 获取字典数据 */
getDictList() {
getDicts("receive_bill_status").then(response => {
this.statusOptions = response.data;
});
},
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
if (this.warehouseOptions.length > 0) {
this.queryParams.warehouseId = this.warehouseOptions[0].warehouseId;
this.handleQuery();
}
});
},
}
}
</script>

89
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -9,16 +9,43 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<el-option
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<el-option
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-option
v-for="dict in dict.type.in_bill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="仓库ID" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="供应商编码" prop="supplierNo">
<el-input
v-model="queryParams.supplierNo"
placeholder="请输入供应商编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!--
<el-form-item label="建立时间" prop="createDate">
<el-input
v-model="queryParams.createDate"
@@ -95,14 +122,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商编码" prop="supplierNo">
<el-input
v-model="queryParams.supplierNo"
placeholder="请输入供应商编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
-->
<!-- <el-form-item label="备用字段1" prop="spare1">
<el-input
v-model="queryParams.spare1"
@@ -203,6 +223,7 @@
plain
icon="el-icon-download"
size="mini"
:disabled="detailMultiple"
@click="handleBarcodePrinting"
v-hasPermi="['in:stockIn:barcodePrinting']"
>打印条码
@@ -222,13 +243,13 @@
</template>
</el-table-column>
<el-table-column label="建立时间" align="center" prop="createDate"/>
<el-table-column label="创建人" align="center" prop="createManId"/>
<el-table-column label="创建人" align="center" prop="createManName"/>
<el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="仓库ID" align="center" prop="warehouseId"/>
<el-table-column label="仓库" align="center" prop="warehouseName"/>
<el-table-column label=" 完成日期" align="center" prop="finishDate"/>
<el-table-column label="erp单号" align="center" prop="erpBill"/>
<el-table-column label="单据来源" align="center" prop="stockSource">
@@ -236,10 +257,10 @@
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
</template>
</el-table-column>
<el-table-column label="部门编码" align="center" prop="departmentNo"/>
<el-table-column label="部门" align="center" prop="departmentName"/>
<!-- <el-table-column label="客户编码" align="center" prop="customerNo" />-->
<el-table-column label="班组编码" align="center" prop="classNo"/>
<el-table-column label="供应商编码" align="center" prop="supplierNo"/>
<el-table-column label="供应商" align="center" prop="supplierName"/>
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
<el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段4" align="center" prop="spare4" />
@@ -273,8 +294,8 @@
@pagination="getList"
/>
<el-table v-loading="detailLoading" :data="stockInDetailList">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子单ID" align="center" prop="stockinDetailId"/>
<!-- <el-table-column label="主单GUID" align="center" prop="stockinGuid" />-->
<el-table-column label="主单ID" align="center" prop="stockinId"/>
@@ -358,12 +379,16 @@ export default {
detailLoading: true,
// 选中数组
ids: [],
detailIds: [],
// 主表选中的数据
stockInListSelected: [],
stockInDetailListSelected: [],
// 非单个禁用
single: true,
detailSingle: true,
// 非多个禁用
multiple: true,
detailMultiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -385,7 +410,7 @@ export default {
inType: null,
createDate: null,
createManId: null,
status: null,
status: '1',
warehouseId: null,
finishDate: null,
erpBill: null,
@@ -493,6 +518,12 @@ export default {
this.single = selection.length !== 1
this.multiple = !selection.length
},
handleDetailSelectionChange(selection){
this.detailIds = selection.map(item => item.stockinDetailId)
this.stockInDetailListSelected = selection
this.detailSingle = selection.length !== 1
this.detailMultiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
@@ -565,7 +596,12 @@ export default {
},
/** 打印条码按钮操作 */
handleBarcodePrinting(row){
barcodePrinting(row.stockinGuid).then(response => {
const stockInId = row.stockinDetailId ||this.detailIds;
//console.log(stockInId)
var data = {
"stockinIdList": stockInId
}
barcodePrinting(data).then(response => {
this.$modal.msgSuccess("打印成功")
this.getList()
})
@@ -611,6 +647,7 @@ export default {
getDetailList(stockinId) {
this.detailLoading = true;
this.queryDetailParams.stockinId = stockinId;
this.queryDetailParams.status = this.queryParams.status;
listStockInDetail(this.queryDetailParams).then(response => {
this.stockInDetailList = response.rows;
this.detailTotal = response.total;