项目初始化
This commit is contained in:
@@ -0,0 +1,152 @@
|
||||
package com.ruoyi.receive.stockin.controller;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.receive.stockin.domain.ReceiveStockin;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
|
||||
import com.ruoyi.receive.stockin.service.IReceiveStockinService;
|
||||
import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.Valid;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 收货单据Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/receive/stockin")
|
||||
public class ReceiveStockinController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IReceiveStockinService receiveStockinService;
|
||||
@Autowired
|
||||
private IReceiveStockinFinishService receiveStockinFinishService;
|
||||
|
||||
/**
|
||||
* 查询收货单据列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockin:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(ReceiveStockin receiveStockin)
|
||||
{
|
||||
startPage();
|
||||
List<ReceiveStockin> list = new ArrayList<>() ;
|
||||
if (Convert.toInt(receiveStockin.getStatus())<1){
|
||||
list = receiveStockinService.selectReceiveStockinList(receiveStockin);
|
||||
}else {
|
||||
list = receiveStockinFinishService.selectReceiveStockinList(receiveStockin);
|
||||
}
|
||||
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出收货单据列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockin:export')")
|
||||
@Log(title = "收货单据", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, ReceiveStockin receiveStockin)
|
||||
{
|
||||
List<ReceiveStockin> list = receiveStockinService.selectReceiveStockinList(receiveStockin);
|
||||
ExcelUtil<ReceiveStockin> util = new ExcelUtil<ReceiveStockin>(ReceiveStockin.class);
|
||||
util.exportExcel(response, list, "收货单据数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取收货单据详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockin:query')")
|
||||
@GetMapping(value = "/{stockinGuid}")
|
||||
public AjaxResult getInfo(@PathVariable("stockinGuid") String stockinGuid)
|
||||
{
|
||||
return success(receiveStockinService.selectReceiveStockinByStockinGuid(stockinGuid));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增收货单据
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockin:add')")
|
||||
@Log(title = "收货单据", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add( @RequestBody @Valid ReceiveStockVo receiveStockin)
|
||||
{
|
||||
return receiveStockinService.insertReceiveStockin(receiveStockin);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增入库单据
|
||||
* @param receiveStockin
|
||||
* @return
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:Stockin:createInStock')")
|
||||
@Log(title = "新增入库单据", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/createStockin")
|
||||
public AjaxResult createStockin(@RequestBody ReceiveStockCreateInVo receiveStockin)
|
||||
{
|
||||
return receiveStockinService.createStockin(receiveStockin);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 导入收货单据
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockin:import')")
|
||||
@Log(title = "收货单据", businessType = BusinessType.IMPORT)
|
||||
@PostMapping("/analyseExportFile")
|
||||
public AjaxResult analyseExportFile(MultipartFile file) throws IOException {
|
||||
ExcelUtil<ReceiveProductVo> util = new ExcelUtil<ReceiveProductVo>(ReceiveProductVo.class);
|
||||
List<ReceiveProductVo> list = util.importExcel(file.getInputStream());
|
||||
return receiveStockinService.analyseExportFile(list);
|
||||
}
|
||||
/**
|
||||
* 下载收货单据模板
|
||||
*/
|
||||
@PostMapping("/importTemplate")
|
||||
public void importTemplate(HttpServletResponse response)
|
||||
{
|
||||
ExcelUtil<ReceiveProductVo> util = new ExcelUtil<ReceiveProductVo>(ReceiveProductVo.class);
|
||||
util.importTemplateExcel(response, "物料数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改收货单据
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockin:edit')")
|
||||
@Log(title = "收货单据", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody ReceiveStockin receiveStockin)
|
||||
{
|
||||
return toAjax(receiveStockinService.updateReceiveStockin(receiveStockin));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除收货单据
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockin:remove')")
|
||||
@Log(title = "收货单据", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stockinGuids}")
|
||||
public AjaxResult remove(@PathVariable String[] stockinGuids)
|
||||
{
|
||||
return toAjax(receiveStockinService.deleteReceiveStockinByStockinGuids(stockinGuids));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,366 @@
|
||||
package com.ruoyi.receive.stockin.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
/**
|
||||
* 收货单据对象 receive_stockin
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
public class ReceiveStockin extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** GUID */
|
||||
private String stockinGuid;
|
||||
|
||||
/** 入库订单ID */
|
||||
@Excel(name = "入库订单ID")
|
||||
private String stockinId;
|
||||
|
||||
/** 入库类型 */
|
||||
@Excel(name = "入库类型")
|
||||
private String inType;
|
||||
|
||||
/** 建立时间 */
|
||||
@Excel(name = "建立时间")
|
||||
private String createDate;
|
||||
|
||||
/** 创建人 */
|
||||
@Excel(name = "创建人")
|
||||
private String createManId;
|
||||
@Excel(name = "创建人")
|
||||
private String createManName;
|
||||
|
||||
/** 单据状态 */
|
||||
@Excel(name = "单据状态")
|
||||
private String status;
|
||||
|
||||
/** 仓库ID */
|
||||
@Excel(name = "仓库ID")
|
||||
private String warehouseId;
|
||||
@Excel(name = "仓库名称")
|
||||
private String warehouseName;
|
||||
|
||||
/** 备用字段5 */
|
||||
@Excel(name = "备用字段5")
|
||||
private String spare5;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
private String spare4;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String spare3;
|
||||
|
||||
/** 完成日期 */
|
||||
@Excel(name = " 完成日期")
|
||||
private String finishDate;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String spare1;
|
||||
|
||||
/** erp单号 */
|
||||
@Excel(name = "erp单号")
|
||||
private String erpBill;
|
||||
|
||||
/** 单据来源 */
|
||||
@Excel(name = "单据来源")
|
||||
private String stockSource;
|
||||
|
||||
/** 部门编码 */
|
||||
@Excel(name = "部门编码")
|
||||
private String departmentNo;
|
||||
@Excel(name = "部门")
|
||||
private String departmentName;
|
||||
|
||||
/** 客户编码 */
|
||||
@Excel(name = "客户编码")
|
||||
private String customerNo;
|
||||
|
||||
/** 班组编码 */
|
||||
@Excel(name = "班组编码")
|
||||
private String classNo;
|
||||
|
||||
/** 供应商编码 */
|
||||
@Excel(name = "供应商编码")
|
||||
private String supplierNo;
|
||||
@Excel(name = "供应商名称")
|
||||
private String supplierName;
|
||||
|
||||
private String lotNo;
|
||||
private String materialDesc;
|
||||
|
||||
public String getLotNo() {
|
||||
return lotNo;
|
||||
}
|
||||
|
||||
public void setLotNo(String lotNo) {
|
||||
this.lotNo = lotNo;
|
||||
}
|
||||
|
||||
public String getMaterialDesc() {
|
||||
return materialDesc;
|
||||
}
|
||||
|
||||
public void setMaterialDesc(String materialDesc) {
|
||||
this.materialDesc = materialDesc;
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
this.stockinGuid = stockinGuid;
|
||||
}
|
||||
|
||||
public String getStockinGuid()
|
||||
{
|
||||
return stockinGuid;
|
||||
}
|
||||
|
||||
public void setStockinId(String stockinId)
|
||||
{
|
||||
this.stockinId = stockinId;
|
||||
}
|
||||
|
||||
public String getStockinId()
|
||||
{
|
||||
return stockinId;
|
||||
}
|
||||
|
||||
public void setInType(String inType)
|
||||
{
|
||||
this.inType = inType;
|
||||
}
|
||||
|
||||
public String getInType()
|
||||
{
|
||||
return inType;
|
||||
}
|
||||
|
||||
public void setCreateDate(String createDate)
|
||||
{
|
||||
this.createDate = createDate;
|
||||
}
|
||||
|
||||
public String getCreateDate()
|
||||
{
|
||||
return createDate;
|
||||
}
|
||||
|
||||
public void setCreateManId(String createManId)
|
||||
{
|
||||
this.createManId = createManId;
|
||||
}
|
||||
|
||||
public String getCreateManId()
|
||||
{
|
||||
return createManId;
|
||||
}
|
||||
|
||||
public void setStatus(String status)
|
||||
{
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getStatus()
|
||||
{
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setWarehouseId(String warehouseId)
|
||||
{
|
||||
this.warehouseId = warehouseId;
|
||||
}
|
||||
|
||||
public String getWarehouseId()
|
||||
{
|
||||
return warehouseId;
|
||||
}
|
||||
|
||||
public void setSpare5(String spare5)
|
||||
{
|
||||
this.spare5 = spare5;
|
||||
}
|
||||
|
||||
public String getSpare5()
|
||||
{
|
||||
return spare5;
|
||||
}
|
||||
|
||||
public void setSpare4(String spare4)
|
||||
{
|
||||
this.spare4 = spare4;
|
||||
}
|
||||
|
||||
public String getSpare4()
|
||||
{
|
||||
return spare4;
|
||||
}
|
||||
|
||||
public void setSpare3(String spare3)
|
||||
{
|
||||
this.spare3 = spare3;
|
||||
}
|
||||
|
||||
public String getSpare3()
|
||||
{
|
||||
return spare3;
|
||||
}
|
||||
|
||||
public void setFinishDate(String finishDate)
|
||||
{
|
||||
this.finishDate = finishDate;
|
||||
}
|
||||
|
||||
public String getFinishDate()
|
||||
{
|
||||
return finishDate;
|
||||
}
|
||||
|
||||
public void setSpare2(String spare2)
|
||||
{
|
||||
this.spare2 = spare2;
|
||||
}
|
||||
|
||||
public String getSpare2()
|
||||
{
|
||||
return spare2;
|
||||
}
|
||||
|
||||
public void setSpare1(String spare1)
|
||||
{
|
||||
this.spare1 = spare1;
|
||||
}
|
||||
|
||||
public String getSpare1()
|
||||
{
|
||||
return spare1;
|
||||
}
|
||||
|
||||
public void setErpBill(String erpBill)
|
||||
{
|
||||
this.erpBill = erpBill;
|
||||
}
|
||||
|
||||
public String getErpBill()
|
||||
{
|
||||
return erpBill;
|
||||
}
|
||||
|
||||
public void setStockSource(String stockSource)
|
||||
{
|
||||
this.stockSource = stockSource;
|
||||
}
|
||||
|
||||
public String getStockSource()
|
||||
{
|
||||
return stockSource;
|
||||
}
|
||||
|
||||
public void setDepartmentNo(String departmentNo)
|
||||
{
|
||||
this.departmentNo = departmentNo;
|
||||
}
|
||||
|
||||
public String getDepartmentNo()
|
||||
{
|
||||
return departmentNo;
|
||||
}
|
||||
|
||||
public void setCustomerNo(String customerNo)
|
||||
{
|
||||
this.customerNo = customerNo;
|
||||
}
|
||||
|
||||
public String getCustomerNo()
|
||||
{
|
||||
return customerNo;
|
||||
}
|
||||
|
||||
public void setClassNo(String classNo)
|
||||
{
|
||||
this.classNo = classNo;
|
||||
}
|
||||
|
||||
public String getClassNo()
|
||||
{
|
||||
return classNo;
|
||||
}
|
||||
|
||||
public void setSupplierNo(String supplierNo)
|
||||
{
|
||||
this.supplierNo = supplierNo;
|
||||
}
|
||||
|
||||
public String getSupplierNo()
|
||||
{
|
||||
return supplierNo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("stockinGuid", getStockinGuid())
|
||||
.append("stockinId", getStockinId())
|
||||
.append("inType", getInType())
|
||||
.append("createDate", getCreateDate())
|
||||
.append("createManId", getCreateManId())
|
||||
.append("status", getStatus())
|
||||
.append("warehouseId", getWarehouseId())
|
||||
.append("spare5", getSpare5())
|
||||
.append("spare4", getSpare4())
|
||||
.append("spare3", getSpare3())
|
||||
.append("finishDate", getFinishDate())
|
||||
.append("spare2", getSpare2())
|
||||
.append("spare1", getSpare1())
|
||||
.append("erpBill", getErpBill())
|
||||
.append("stockSource", getStockSource())
|
||||
.append("departmentNo", getDepartmentNo())
|
||||
.append("customerNo", getCustomerNo())
|
||||
.append("classNo", getClassNo())
|
||||
.append("supplierNo", getSupplierNo())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
package com.ruoyi.receive.stockin.domain.vo;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.ToString;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@ToString
|
||||
public class ReceiveProductVo {
|
||||
@Excel(name = "序号")
|
||||
private String seqNo;
|
||||
|
||||
@Excel(name = "子件")
|
||||
private String subItem;
|
||||
|
||||
@Excel(name = "物料编码")
|
||||
@NotEmpty(message = "物料GUID不能为空")
|
||||
private String productId;
|
||||
|
||||
@Excel(name = "物料描述")
|
||||
private String materialDesc;
|
||||
|
||||
@Excel(name = "英文描述")
|
||||
private String englishDesc;
|
||||
|
||||
@Excel(name = "数量")
|
||||
@NotEmpty(message = "物料数量不能为空")
|
||||
private String quantity;
|
||||
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
@Excel(name = "单件净重Unit Net Weight")
|
||||
private String unitNetWeight;
|
||||
|
||||
@Excel(name = "总净重Total Net Weight")
|
||||
private String totalNetWeight;
|
||||
|
||||
@Excel(name = "箱号Carton NO.")
|
||||
private String cartonNo;
|
||||
|
||||
@Excel(name = "包装方式")
|
||||
private String packingMethod;
|
||||
|
||||
@Excel(name = "长(MM)")
|
||||
private String length;
|
||||
|
||||
@Excel(name = "宽(MM)")
|
||||
private String width;
|
||||
|
||||
@Excel(name = "高(MM)")
|
||||
private String height;
|
||||
|
||||
@Excel(name = "体积m³")
|
||||
private String volume;
|
||||
|
||||
@Excel(name = "净重(KG)NET WEIGHT")
|
||||
private String netWeight;
|
||||
|
||||
@Excel(name = "毛重(KG)GROSS WEIGHT")
|
||||
private String grossWeight;
|
||||
|
||||
@Excel(name = "单价")
|
||||
private String unitPrice;
|
||||
|
||||
@Excel(name = "总价")
|
||||
private String totalPrice;
|
||||
|
||||
@Excel(name = "备注")
|
||||
private String remark;
|
||||
|
||||
@Excel(name = "批次号")
|
||||
@NotEmpty(message = "批次号不能为空")
|
||||
private String lotNo;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.ruoyi.receive.stockin.domain.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ReceiveStockCreateInVo {
|
||||
private List<String> stockinGuidList;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.ruoyi.receive.stockin.domain.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ReceiveStockDetailQualityInsVo {
|
||||
//子单据id
|
||||
private String stockinDetailId;
|
||||
//质检数量
|
||||
private String quantity;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.ruoyi.receive.stockin.domain.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@ToString
|
||||
public class ReceiveStockQualityInsVo {
|
||||
|
||||
private String stockinGuid;
|
||||
|
||||
private List<ReceiveStockDetailQualityInsVo> list;
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.ruoyi.receive.stockin.domain.vo;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@ToString
|
||||
public class ReceiveStockVo {
|
||||
@NotBlank(message = "仓库不能为空")
|
||||
private String warehouseId;
|
||||
@NotBlank(message = "供应商不能为空")
|
||||
private String supplierId;
|
||||
private String remark;
|
||||
@NotEmpty(message = "商品不能为空")
|
||||
private List<ReceiveProductVo> productVoList;
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package com.ruoyi.receive.stockin.mapper;
|
||||
|
||||
import com.ruoyi.receive.stockin.domain.ReceiveStockin;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 收货单据Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
public interface ReceiveStockinMapper
|
||||
{
|
||||
/**
|
||||
* 查询收货单据
|
||||
*
|
||||
* @param stockinGuid 收货单据主键
|
||||
* @return 收货单据
|
||||
*/
|
||||
public ReceiveStockin selectReceiveStockinByStockinGuid(String stockinGuid);
|
||||
|
||||
/**
|
||||
* 查询收货单据列表
|
||||
*
|
||||
* @param receiveStockin 收货单据
|
||||
* @return 收货单据集合
|
||||
*/
|
||||
public List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin);
|
||||
|
||||
/**
|
||||
* 新增收货单据
|
||||
*
|
||||
* @param receiveStockin 收货单据
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertReceiveStockin(ReceiveStockin receiveStockin);
|
||||
|
||||
/**
|
||||
* 修改收货单据
|
||||
*
|
||||
* @param receiveStockin 收货单据
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateReceiveStockin(ReceiveStockin receiveStockin);
|
||||
|
||||
/**
|
||||
* 删除收货单据
|
||||
*
|
||||
* @param stockinGuid 收货单据主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinByStockinGuid(String stockinGuid);
|
||||
|
||||
/**
|
||||
* 批量删除收货单据
|
||||
*
|
||||
* @param stockinGuids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinByStockinGuids(String[] stockinGuids);
|
||||
|
||||
/**
|
||||
* 插入历史表
|
||||
* @param receiveStockinGuid
|
||||
*/
|
||||
void insertReceiveStockinHistory(String receiveStockinGuid);
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
package com.ruoyi.receive.stockin.service;
|
||||
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.receive.stockin.domain.ReceiveStockin;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 收货单据Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
public interface IReceiveStockinService
|
||||
{
|
||||
/**
|
||||
* 查询收货单据
|
||||
*
|
||||
* @param stockinGuid 收货单据主键
|
||||
* @return 收货单据
|
||||
*/
|
||||
public ReceiveStockin selectReceiveStockinByStockinGuid(String stockinGuid);
|
||||
|
||||
/**
|
||||
* 查询收货单据列表
|
||||
*
|
||||
* @param receiveStockin 收货单据
|
||||
* @return 收货单据集合
|
||||
*/
|
||||
public List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin);
|
||||
|
||||
/**
|
||||
* 新增收货单据
|
||||
*
|
||||
* @param receiveStockin 收货单据
|
||||
* @return 结果
|
||||
*/
|
||||
public AjaxResult insertReceiveStockin(ReceiveStockVo receiveStockin);
|
||||
|
||||
/**
|
||||
* 修改收货单据
|
||||
*
|
||||
* @param receiveStockin 收货单据
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateReceiveStockin(ReceiveStockin receiveStockin);
|
||||
|
||||
/**
|
||||
* 批量删除收货单据
|
||||
*
|
||||
* @param stockinGuids 需要删除的收货单据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinByStockinGuids(String[] stockinGuids);
|
||||
|
||||
/**
|
||||
* 删除收货单据信息
|
||||
*
|
||||
* @param stockinGuid 收货单据主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinByStockinGuid(String stockinGuid);
|
||||
|
||||
/**
|
||||
* 解析导入文件物料数据
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
AjaxResult analyseExportFile(List<ReceiveProductVo> list );
|
||||
|
||||
/**
|
||||
* 创建入库单据
|
||||
* @param receiveStockin
|
||||
* @return
|
||||
*/
|
||||
AjaxResult createStockin(ReceiveStockCreateInVo receiveStockin);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,298 @@
|
||||
package com.ruoyi.receive.stockin.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.ruoyi.bas.BasProduct.domain.BasProduct;
|
||||
import com.ruoyi.bas.BasProduct.service.IBasProductService;
|
||||
import com.ruoyi.bas.basJobId.service.IBasJobIdService;
|
||||
import com.ruoyi.common.annotation.DataScope;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import com.ruoyi.common.utils.MessageUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.in.stockin.domain.InStockin;
|
||||
import com.ruoyi.in.stockin.service.IInStockinService;
|
||||
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
|
||||
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
|
||||
import com.ruoyi.receive.stockin.domain.ReceiveStockin;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
|
||||
import com.ruoyi.receive.stockin.mapper.ReceiveStockinMapper;
|
||||
import com.ruoyi.receive.stockin.service.IReceiveStockinService;
|
||||
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
|
||||
import com.ruoyi.receive.stockindetail.service.IReceiveStockinDetailService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 收货单据Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class ReceiveStockinServiceImpl implements IReceiveStockinService
|
||||
{
|
||||
@Autowired
|
||||
private ReceiveStockinMapper receiveStockinMapper;
|
||||
@Autowired
|
||||
private IReceiveStockinDetailService iReceiveStockinDetailService;
|
||||
@Autowired
|
||||
private IBasProductService iBasProductService;
|
||||
@Autowired
|
||||
private IInStockinDetailService iInStockinDetailService;
|
||||
@Autowired
|
||||
private IInStockinService inStockinServicel;
|
||||
@Autowired
|
||||
private IBasJobIdService iBasJobIdService;
|
||||
|
||||
/**
|
||||
* 查询收货单据
|
||||
*
|
||||
* @param stockinGuid 收货单据主键
|
||||
* @return 收货单据
|
||||
*/
|
||||
@Override
|
||||
public ReceiveStockin selectReceiveStockinByStockinGuid(String stockinGuid)
|
||||
{
|
||||
return receiveStockinMapper.selectReceiveStockinByStockinGuid(stockinGuid);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询收货单据列表
|
||||
*
|
||||
* @param receiveStockin 收货单据
|
||||
* @return 收货单据
|
||||
*/
|
||||
@Override
|
||||
@DataScope(warehouseAlias = "rs")
|
||||
public List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin)
|
||||
{
|
||||
return receiveStockinMapper.selectReceiveStockinList(receiveStockin);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增收货单据
|
||||
*
|
||||
* @param receiveStockVo 收货单据
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public AjaxResult insertReceiveStockin(ReceiveStockVo receiveStockVo)
|
||||
{
|
||||
List<ReceiveProductVo> productVoList = receiveStockVo.getProductVoList();
|
||||
if (CollUtil.isEmpty(productVoList)){
|
||||
return AjaxResult.error(MessageUtils.message("error.message30"));
|
||||
}
|
||||
ReceiveStockin receiveStockin = new ReceiveStockin();
|
||||
receiveStockin.setStockinGuid(IdUtil.fastSimpleUUID());
|
||||
receiveStockin.setSupplierNo(receiveStockVo.getSupplierId());
|
||||
receiveStockin.setWarehouseId(receiveStockVo.getWarehouseId());
|
||||
receiveStockin.setCreateDate(DateUtil.format(DateUtil.date(),"yyyy-MM-dd HH:mm:ss"));
|
||||
receiveStockin.setInType("1");
|
||||
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);
|
||||
int i = 1;
|
||||
for (ReceiveProductVo receiveProductVo : productVoList) {
|
||||
BasProduct basProduct = iBasProductService.selectBasProductByProductId(receiveProductVo.getProductId());
|
||||
ReceiveStockinDetail receiveStockinDetail = new ReceiveStockinDetail();
|
||||
receiveStockinDetail.setQuantity(receiveProductVo.getQuantity());
|
||||
receiveStockinDetail.setProductGuid(basProduct.getProductGuid());
|
||||
receiveStockinDetail.setProductId(basProduct.getProductId());
|
||||
receiveStockinDetail.setStockinId(receiveStockin.getStockinId());
|
||||
receiveStockinDetail.setStockinDetailId(receiveStockin.getStockinId()+"-"+i++);
|
||||
receiveStockinDetail.setStockinGuid(receiveStockin.getStockinGuid());
|
||||
ExtraField extraField = new ExtraField();
|
||||
BeanUtil.copyProperties(receiveProductVo,extraField);
|
||||
receiveStockinDetail.setSpare1(JSONUtil.toJsonStr(extraField));
|
||||
receiveStockinDetail.setStockStatus("0");
|
||||
receiveStockinDetail.setLotNo(receiveProductVo.getLotNo());
|
||||
iReceiveStockinDetailService.insertReceiveStockinDetail(receiveStockinDetail);
|
||||
}
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改收货单据
|
||||
*
|
||||
* @param receiveStockin 收货单据
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateReceiveStockin(ReceiveStockin receiveStockin)
|
||||
{
|
||||
return receiveStockinMapper.updateReceiveStockin(receiveStockin);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除收货单据
|
||||
*
|
||||
* @param stockinGuids 需要删除的收货单据主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReceiveStockinByStockinGuids(String[] stockinGuids)
|
||||
{
|
||||
return receiveStockinMapper.deleteReceiveStockinByStockinGuids(stockinGuids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除收货单据信息
|
||||
*
|
||||
* @param stockinGuid 收货单据主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReceiveStockinByStockinGuid(String stockinGuid)
|
||||
{
|
||||
return receiveStockinMapper.deleteReceiveStockinByStockinGuid(stockinGuid);
|
||||
}
|
||||
/**
|
||||
* 解析导入文件物料数据
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public AjaxResult analyseExportFile(List<ReceiveProductVo> list) {
|
||||
if (CollUtil.isEmpty(list)){
|
||||
log.error("导入数据为空");
|
||||
return AjaxResult.error(MessageUtils.message("error.message24"));
|
||||
}
|
||||
List<String> collect = list.stream().map(ReceiveProductVo::getProductId).collect(Collectors.toList());
|
||||
List<BasProduct> result = iBasProductService.selectBasProductListByProductIds(collect);
|
||||
for (BasProduct basProduct : result) {
|
||||
Optional<ReceiveProductVo> first = list.stream().filter(x -> x.getProductId().equals(basProduct.getProductId())).findFirst();
|
||||
// first.ifPresent(receiveProductVo -> basProduct.setQuantity(receiveProductVo.getQuantity()));
|
||||
// first.ifPresent(receiveProductVo -> basProduct.setLotNo(receiveProductVo.getLotNo()));
|
||||
first.ifPresent(receiveProductVo -> basProduct.setSpare3(receiveProductVo.getCartonNo()));
|
||||
first.ifPresent(receiveProductVo -> basProduct.setSpare4(receiveProductVo.getPackingMethod()));
|
||||
}
|
||||
return AjaxResult.success(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建入库单据
|
||||
* @param receiveStockCreateInVo
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public AjaxResult createStockin(ReceiveStockCreateInVo receiveStockCreateInVo) {
|
||||
try {
|
||||
List<String> stockinGuidList = receiveStockCreateInVo.getStockinGuidList();
|
||||
if (CollUtil.isNotEmpty(stockinGuidList)){
|
||||
for (String receiveStockinGuid : stockinGuidList) {
|
||||
ReceiveStockin receiveStockin = selectReceiveStockinByStockinGuid(receiveStockinGuid);
|
||||
ReceiveStockinDetail receiveStockinDetailParam = new ReceiveStockinDetail();
|
||||
receiveStockinDetailParam.setStockinGuid(receiveStockinGuid);
|
||||
List<ReceiveStockinDetail> list = iReceiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetailParam);
|
||||
if (CollUtil.isNotEmpty(list)){
|
||||
Optional<ReceiveStockinDetail> first = list.stream().filter(x -> x.getStockStatus().equals("0")).findFirst();
|
||||
if (first.isPresent()){
|
||||
ReceiveStockinDetail receiveStockinDetail = first.get();
|
||||
log.error("编号:{}未质检", receiveStockinDetail.getProductId());
|
||||
return AjaxResult.error(MessageUtils.message("error.message29"));
|
||||
}
|
||||
|
||||
InStockin inStockin = getInStockinByReceiveStockin(receiveStockin);
|
||||
//插入入库单据
|
||||
inStockinServicel.insertInStockin(inStockin);
|
||||
List<InStockinDetail> inStockinDetailList = getInStockinDetailByReceiveStockin(inStockin,list);
|
||||
//插入入库单据详情
|
||||
iInStockinDetailService.insertInStockinDetailList(inStockinDetailList);
|
||||
//修改单据状态
|
||||
receiveStockin.setStatus("1");
|
||||
receiveStockinMapper.updateReceiveStockin(receiveStockin);
|
||||
//插入历史接收单据
|
||||
receiveStockinMapper.insertReceiveStockinHistory(receiveStockinGuid);
|
||||
//插入历史接收单据子单详情
|
||||
iReceiveStockinDetailService.insertReceiveStockinDetailHistory(receiveStockinGuid);
|
||||
//删除接收单据
|
||||
receiveStockinMapper.deleteReceiveStockinByStockinGuid(receiveStockinGuid);
|
||||
//删除接收单据子单详情
|
||||
List<String> receiveStockinDetailIdList = list.stream().map(ReceiveStockinDetail::getStockinDetailId).collect(Collectors.toList());
|
||||
iReceiveStockinDetailService.deleteReceiveStockinDetailByStockinDetailIds(Convert.toStrArray(receiveStockinDetailIdList));
|
||||
|
||||
}
|
||||
}
|
||||
}else {
|
||||
log.error("单据不存在");
|
||||
return AjaxResult.error(MessageUtils.message("error.message27"));
|
||||
}
|
||||
}catch (Exception e){
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 获取入库子单详情
|
||||
*
|
||||
* @param inStockin
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
private List<InStockinDetail> getInStockinDetailByReceiveStockin(InStockin inStockin, List<ReceiveStockinDetail> list) {
|
||||
if (CollUtil.isEmpty(list)){
|
||||
return null;
|
||||
}
|
||||
List<InStockinDetail> inStockinDetailList = new ArrayList<>();
|
||||
int i = 1;
|
||||
for (ReceiveStockinDetail receiveStockinDetail : list) {
|
||||
InStockinDetail inStockinDetail = new InStockinDetail();
|
||||
BeanUtil.copyProperties(receiveStockinDetail,inStockinDetail);
|
||||
inStockinDetail.setStockinGuid(inStockin.getStockinGuid());
|
||||
inStockinDetail.setStockinDetailId(inStockin.getStockinId()+"-"+i++);
|
||||
inStockinDetail.setStockinId(inStockin.getStockinId());
|
||||
inStockinDetail.setStockStatus("0");
|
||||
inStockinDetail.setAssignNum("0");
|
||||
inStockinDetail.setScanNum("0");
|
||||
inStockinDetail.setSpare2(receiveStockinDetail.getStockinDetailId());
|
||||
inStockinDetailList.add(inStockinDetail);
|
||||
}
|
||||
return inStockinDetailList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取入库单据
|
||||
* @param receiveStockin
|
||||
* @return
|
||||
*/
|
||||
private InStockin getInStockinByReceiveStockin(ReceiveStockin receiveStockin) {
|
||||
if (receiveStockin == null) {
|
||||
return null;
|
||||
}
|
||||
InStockin inStockin = new InStockin();
|
||||
BeanUtil.copyProperties(receiveStockin,inStockin );
|
||||
inStockin.setStockinGuid(IdUtil.fastSimpleUUID());
|
||||
inStockin.setStockinId(iBasJobIdService.getJobId("RKD"));
|
||||
// 设置状态等默认值
|
||||
inStockin.setStatus("1");
|
||||
inStockin.setSpare1(receiveStockin.getStockinId());
|
||||
inStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
|
||||
return inStockin;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
package com.ruoyi.receive.stockindetail.controller;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
|
||||
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
|
||||
import com.ruoyi.receive.stockindetail.service.IReceiveStockinDetailService;
|
||||
import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinishService;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 收货单据子单Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/receive/stockInDetail")
|
||||
public class ReceiveStockinDetailController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IReceiveStockinDetailService receiveStockinDetailService;
|
||||
@Autowired
|
||||
private IReceiveStockinDetailFinishService receiveStockinDetailFinishService;
|
||||
|
||||
/**
|
||||
* 查询收货单据子单列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockInDetail:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(ReceiveStockinDetail receiveStockinDetail)
|
||||
{
|
||||
startPage();
|
||||
List<ReceiveStockinDetail> list = new ArrayList<>();
|
||||
if (Convert.toInt(receiveStockinDetail.getStatus())<1){
|
||||
list = receiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetail);
|
||||
}else {
|
||||
list =receiveStockinDetailFinishService.selectReceiveStockinDetailList(receiveStockinDetail);
|
||||
}
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出收货单据子单列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockInDetail:export')")
|
||||
@Log(title = "收货单据子单", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, ReceiveStockinDetail receiveStockinDetail)
|
||||
{
|
||||
List<ReceiveStockinDetail> list = receiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetail);
|
||||
ExcelUtil<ReceiveStockinDetail> util = new ExcelUtil<ReceiveStockinDetail>(ReceiveStockinDetail.class);
|
||||
util.exportExcel(response, list, "收货单据子单数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取收货单据子单详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockInDetail:query')")
|
||||
@GetMapping(value = "/{stockinDetailId}")
|
||||
public AjaxResult getInfo(@PathVariable("stockinDetailId") String stockinDetailId)
|
||||
{
|
||||
return success(receiveStockinDetailService.selectReceiveStockinDetailByStockinDetailId(stockinDetailId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增收货单据子单
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockInDetail:add')")
|
||||
@Log(title = "收货单据子单", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody ReceiveStockinDetail receiveStockinDetail)
|
||||
{
|
||||
return toAjax(receiveStockinDetailService.insertReceiveStockinDetail(receiveStockinDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改收货单据子单
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockInDetail:edit')")
|
||||
@Log(title = "收货单据子单", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody ReceiveStockinDetail receiveStockinDetail)
|
||||
{
|
||||
return toAjax(receiveStockinDetailService.updateReceiveStockinDetail(receiveStockinDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除收货单据子单
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockInDetail:remove')")
|
||||
@Log(title = "收货单据子单", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stockinDetailIds}")
|
||||
public AjaxResult remove(@PathVariable String[] stockinDetailIds)
|
||||
{
|
||||
return toAjax(receiveStockinDetailService.deleteReceiveStockinDetailByStockinDetailIds(stockinDetailIds));
|
||||
}
|
||||
|
||||
/**
|
||||
* 质检收货子单据
|
||||
* @param receiveStockQualityInsVo
|
||||
* @return
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockInDetail:qualityInspection')")
|
||||
@Log(title = "质检收货子单据", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/qualityInspection")
|
||||
public AjaxResult qualityInspection(@RequestBody ReceiveStockQualityInsVo receiveStockQualityInsVo)
|
||||
{
|
||||
return receiveStockinDetailService.qualityInspection(receiveStockQualityInsVo);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,133 @@
|
||||
package com.ruoyi.receive.stockindetail.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.ToString;
|
||||
|
||||
/**
|
||||
* 收货单据子单对象 receive_stockin_detail
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@ToString
|
||||
public class ReceiveStockinDetail extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 子单ID */
|
||||
private String stockinDetailId;
|
||||
|
||||
/** 主单GUID */
|
||||
@Excel(name = "主单GUID")
|
||||
private String stockinGuid;
|
||||
|
||||
/** 主单ID */
|
||||
@Excel(name = "主单ID")
|
||||
private String stockinId;
|
||||
|
||||
/** 批次号 */
|
||||
@Excel(name = "批次号")
|
||||
private String lotNo;
|
||||
|
||||
/** 物料ID */
|
||||
@Excel(name = "物料ID")
|
||||
private String productGuid;
|
||||
|
||||
/** 物料编码 */
|
||||
@Excel(name = "物料编码")
|
||||
private String productId;
|
||||
|
||||
/** 计划数量 */
|
||||
@Excel(name = "计划数量")
|
||||
private String quantity;
|
||||
|
||||
/** 计划数量(箱) */
|
||||
@Excel(name = "计划数量(箱)")
|
||||
private String quantityX;
|
||||
|
||||
/** 计划数量(件) */
|
||||
@Excel(name = "计划数量(件)")
|
||||
private String quantityJ;
|
||||
|
||||
/** 参考单价 */
|
||||
@Excel(name = "参考单价")
|
||||
private String price;
|
||||
|
||||
/** 品牌 */
|
||||
@Excel(name = "品牌")
|
||||
private String cargoNo;
|
||||
|
||||
/** 实际数量 */
|
||||
@Excel(name = "实际数量")
|
||||
private String assignNum;
|
||||
|
||||
/** 实际数量(箱) */
|
||||
@Excel(name = "实际数量(箱)")
|
||||
private String assignNumX;
|
||||
|
||||
/** 实际数量(件) */
|
||||
@Excel(name = "实际数量(件)")
|
||||
private String assignNumJ;
|
||||
|
||||
/** 入库日期 */
|
||||
@Excel(name = "入库日期")
|
||||
private String printDate;
|
||||
|
||||
/** 单据状态 */
|
||||
@Excel(name = "单据状态")
|
||||
private String stockStatus;
|
||||
|
||||
/** 供应商编码 */
|
||||
@Excel(name = "供应商编码")
|
||||
private String supplierId;
|
||||
|
||||
/** 客户编码 */
|
||||
@Excel(name = "客户编码")
|
||||
private String customerId;
|
||||
|
||||
/** 单位 */
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
/** 规格 */
|
||||
@Excel(name = "规格")
|
||||
private String spec;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String spare1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String spare3;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
private String spare4;
|
||||
|
||||
/** 备用字段5 */
|
||||
@Excel(name = "备用字段5")
|
||||
private String spare5;
|
||||
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段6")
|
||||
private String spare6;
|
||||
|
||||
private String status;
|
||||
/**
|
||||
* 扩展字段
|
||||
*/
|
||||
private ExtraField extraField;
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package com.ruoyi.receive.stockindetail.mapper;
|
||||
|
||||
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 收货单据子单Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
public interface ReceiveStockinDetailMapper
|
||||
{
|
||||
/**
|
||||
* 查询收货单据子单
|
||||
*
|
||||
* @param stockinDetailId 收货单据子单主键
|
||||
* @return 收货单据子单
|
||||
*/
|
||||
public ReceiveStockinDetail selectReceiveStockinDetailByStockinDetailId(String stockinDetailId);
|
||||
|
||||
/**
|
||||
* 查询收货单据子单列表
|
||||
*
|
||||
* @param receiveStockinDetail 收货单据子单
|
||||
* @return 收货单据子单集合
|
||||
*/
|
||||
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail);
|
||||
|
||||
/**
|
||||
* 新增收货单据子单
|
||||
*
|
||||
* @param receiveStockinDetail 收货单据子单
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertReceiveStockinDetail(ReceiveStockinDetail receiveStockinDetail);
|
||||
|
||||
/**
|
||||
* 修改收货单据子单
|
||||
*
|
||||
* @param receiveStockinDetail 收货单据子单
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateReceiveStockinDetail(ReceiveStockinDetail receiveStockinDetail);
|
||||
|
||||
/**
|
||||
* 删除收货单据子单
|
||||
*
|
||||
* @param stockinDetailId 收货单据子单主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinDetailByStockinDetailId(String stockinDetailId);
|
||||
|
||||
/**
|
||||
* 批量删除收货单据子单
|
||||
*
|
||||
* @param stockinDetailIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinDetailByStockinDetailIds(String[] stockinDetailIds);
|
||||
|
||||
void insertReceiveStockinDetailHistory(String receiveStockinGuid);
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
package com.ruoyi.receive.stockindetail.service;
|
||||
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
|
||||
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 收货单据子单Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
public interface IReceiveStockinDetailService
|
||||
{
|
||||
/**
|
||||
* 查询收货单据子单
|
||||
*
|
||||
* @param stockinDetailId 收货单据子单主键
|
||||
* @return 收货单据子单
|
||||
*/
|
||||
public ReceiveStockinDetail selectReceiveStockinDetailByStockinDetailId(String stockinDetailId);
|
||||
|
||||
/**
|
||||
* 查询收货单据子单列表
|
||||
*
|
||||
* @param receiveStockinDetail 收货单据子单
|
||||
* @return 收货单据子单集合
|
||||
*/
|
||||
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail);
|
||||
|
||||
/**
|
||||
* 新增收货单据子单
|
||||
*
|
||||
* @param receiveStockinDetail 收货单据子单
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertReceiveStockinDetail(ReceiveStockinDetail receiveStockinDetail);
|
||||
|
||||
/**
|
||||
* 修改收货单据子单
|
||||
*
|
||||
* @param receiveStockinDetail 收货单据子单
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateReceiveStockinDetail(ReceiveStockinDetail receiveStockinDetail);
|
||||
|
||||
/**
|
||||
* 批量删除收货单据子单
|
||||
*
|
||||
* @param stockinDetailIds 需要删除的收货单据子单主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinDetailByStockinDetailIds(String[] stockinDetailIds);
|
||||
|
||||
/**
|
||||
* 删除收货单据子单信息
|
||||
*
|
||||
* @param stockinDetailId 收货单据子单主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinDetailByStockinDetailId(String stockinDetailId);
|
||||
|
||||
/**
|
||||
* 插入历史数据
|
||||
* @param receiveStockinGuid
|
||||
*/
|
||||
void insertReceiveStockinDetailHistory(String receiveStockinGuid);
|
||||
|
||||
/**
|
||||
* 质检收货子单据
|
||||
* @param receiveStockQualityInsVo
|
||||
* @return
|
||||
*/
|
||||
AjaxResult qualityInspection(ReceiveStockQualityInsVo receiveStockQualityInsVo);
|
||||
}
|
||||
@@ -0,0 +1,147 @@
|
||||
package com.ruoyi.receive.stockindetail.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.utils.MessageUtils;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockDetailQualityInsVo;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
|
||||
import com.ruoyi.receive.stockin.service.IReceiveStockinService;
|
||||
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
|
||||
import com.ruoyi.receive.stockindetail.mapper.ReceiveStockinDetailMapper;
|
||||
import com.ruoyi.receive.stockindetail.service.IReceiveStockinDetailService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 收货单据子单Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailService {
|
||||
@Autowired
|
||||
private ReceiveStockinDetailMapper receiveStockinDetailMapper;
|
||||
@Autowired
|
||||
private IReceiveStockinService receiveStockinService;
|
||||
|
||||
|
||||
/**
|
||||
* 查询收货单据子单
|
||||
*
|
||||
* @param stockinDetailId 收货单据子单主键
|
||||
* @return 收货单据子单
|
||||
*/
|
||||
@Override
|
||||
public ReceiveStockinDetail selectReceiveStockinDetailByStockinDetailId(String stockinDetailId) {
|
||||
return receiveStockinDetailMapper.selectReceiveStockinDetailByStockinDetailId(stockinDetailId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询收货单据子单列表
|
||||
*
|
||||
* @param receiveStockinDetail 收货单据子单
|
||||
* @return 收货单据子单
|
||||
*/
|
||||
@Override
|
||||
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) {
|
||||
return receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增收货单据子单
|
||||
*
|
||||
* @param receiveStockinDetail 收货单据子单
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertReceiveStockinDetail(ReceiveStockinDetail receiveStockinDetail) {
|
||||
return receiveStockinDetailMapper.insertReceiveStockinDetail(receiveStockinDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改收货单据子单
|
||||
*
|
||||
* @param receiveStockinDetail 收货单据子单
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int updateReceiveStockinDetail(ReceiveStockinDetail receiveStockinDetail) {
|
||||
try {
|
||||
receiveStockinDetailMapper.updateReceiveStockinDetail(receiveStockinDetail);
|
||||
ReceiveStockinDetail receiveStockinDetail1 = new ReceiveStockinDetail();
|
||||
receiveStockinDetail1.setStockinId(receiveStockinDetail.getStockinGuid());
|
||||
List<ReceiveStockinDetail> receiveStockinDetails = receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail1);
|
||||
//过滤掉receiveStockinDetails中stockStatus等于1的数据
|
||||
receiveStockinDetails = receiveStockinDetails.stream()
|
||||
.filter(detail -> !"1".equals(detail.getStockStatus()))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
if (receiveStockinDetails.isEmpty()) {
|
||||
ReceiveStockCreateInVo receiveStockCreateInVo = new ReceiveStockCreateInVo();
|
||||
List<String> strings = new ArrayList<>();
|
||||
strings.add(receiveStockinDetail.getStockinGuid());
|
||||
receiveStockCreateInVo.setStockinGuidList(strings);
|
||||
receiveStockinService.createStockin(receiveStockCreateInVo);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除收货单据子单
|
||||
*
|
||||
* @param stockinDetailIds 需要删除的收货单据子单主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReceiveStockinDetailByStockinDetailIds(String[] stockinDetailIds) {
|
||||
return receiveStockinDetailMapper.deleteReceiveStockinDetailByStockinDetailIds(stockinDetailIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除收货单据子单信息
|
||||
*
|
||||
* @param stockinDetailId 收货单据子单主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReceiveStockinDetailByStockinDetailId(String stockinDetailId) {
|
||||
return receiveStockinDetailMapper.deleteReceiveStockinDetailByStockinDetailId(stockinDetailId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertReceiveStockinDetailHistory(String receiveStockinGuid) {
|
||||
receiveStockinDetailMapper.insertReceiveStockinDetailHistory(receiveStockinGuid);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public AjaxResult qualityInspection(ReceiveStockQualityInsVo receiveStockQualityInsVo) {
|
||||
if (CollUtil.isEmpty(receiveStockQualityInsVo.getList())) {
|
||||
log.error("请选择质检项");
|
||||
return AjaxResult.error(MessageUtils.message("error.message13"));
|
||||
}
|
||||
for (ReceiveStockDetailQualityInsVo receiveStockDetailQualityInsVo : receiveStockQualityInsVo.getList()) {
|
||||
ReceiveStockinDetail receiveStockinDetail = selectReceiveStockinDetailByStockinDetailId(receiveStockDetailQualityInsVo.getStockinDetailId());
|
||||
if (receiveStockinDetail!=null) {
|
||||
receiveStockinDetail.setQuantity(receiveStockDetailQualityInsVo.getQuantity());
|
||||
receiveStockinDetail.setStockStatus("1");
|
||||
updateReceiveStockinDetail(receiveStockinDetail);
|
||||
}
|
||||
}
|
||||
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
package com.ruoyi.receive.stockindetailfinish.controller;
|
||||
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
|
||||
import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinishService;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 历史接收单据子信息Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/receive/stockinDetailFinish")
|
||||
public class ReceiveStockinDetailFinishController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IReceiveStockinDetailFinishService receiveStockinDetailFinishService;
|
||||
|
||||
/**
|
||||
* 查询历史接收单据子信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(ReceiveStockinDetailFinish receiveStockinDetailFinish)
|
||||
{
|
||||
startPage();
|
||||
List<ReceiveStockinDetailFinish> list = receiveStockinDetailFinishService.selectReceiveStockinDetailFinishList(receiveStockinDetailFinish);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出历史接收单据子信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:export')")
|
||||
@Log(title = "历史接收单据子信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, ReceiveStockinDetailFinish receiveStockinDetailFinish)
|
||||
{
|
||||
List<ReceiveStockinDetailFinish> list = receiveStockinDetailFinishService.selectReceiveStockinDetailFinishList(receiveStockinDetailFinish);
|
||||
ExcelUtil<ReceiveStockinDetailFinish> util = new ExcelUtil<ReceiveStockinDetailFinish>(ReceiveStockinDetailFinish.class);
|
||||
util.exportExcel(response, list, "历史接收单据子信息数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取历史接收单据子信息详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:query')")
|
||||
@GetMapping(value = "/{stockinDetailId}")
|
||||
public AjaxResult getInfo(@PathVariable("stockinDetailId") String stockinDetailId)
|
||||
{
|
||||
return success(receiveStockinDetailFinishService.selectReceiveStockinDetailFinishByStockinDetailId(stockinDetailId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增历史接收单据子信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:add')")
|
||||
@Log(title = "历史接收单据子信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody ReceiveStockinDetailFinish receiveStockinDetailFinish)
|
||||
{
|
||||
return toAjax(receiveStockinDetailFinishService.insertReceiveStockinDetailFinish(receiveStockinDetailFinish));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改历史接收单据子信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:edit')")
|
||||
@Log(title = "历史接收单据子信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody ReceiveStockinDetailFinish receiveStockinDetailFinish)
|
||||
{
|
||||
return toAjax(receiveStockinDetailFinishService.updateReceiveStockinDetailFinish(receiveStockinDetailFinish));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除历史接收单据子信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:remove')")
|
||||
@Log(title = "历史接收单据子信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stockinDetailIds}")
|
||||
public AjaxResult remove(@PathVariable String[] stockinDetailIds)
|
||||
{
|
||||
return toAjax(receiveStockinDetailFinishService.deleteReceiveStockinDetailFinishByStockinDetailIds(stockinDetailIds));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,413 @@
|
||||
package com.ruoyi.receive.stockindetailfinish.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
/**
|
||||
* 历史接收单据子信息对象 receive_stockin_detail_finish
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
public class ReceiveStockinDetailFinish extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 子单ID */
|
||||
private String stockinDetailId;
|
||||
|
||||
/** 主单GUID */
|
||||
@Excel(name = "主单GUID")
|
||||
private String stockinGuid;
|
||||
|
||||
/** 主单ID */
|
||||
@Excel(name = "主单ID")
|
||||
private String stockinId;
|
||||
|
||||
/** 批次号 */
|
||||
@Excel(name = "批次号")
|
||||
private String lotNo;
|
||||
|
||||
/** 物料ID */
|
||||
@Excel(name = "物料ID")
|
||||
private String productGuid;
|
||||
|
||||
/** 物料编码 */
|
||||
@Excel(name = "物料编码")
|
||||
private String productId;
|
||||
|
||||
/** 计划数量 */
|
||||
@Excel(name = "计划数量")
|
||||
private String quantity;
|
||||
|
||||
/** 计划数量(箱) */
|
||||
@Excel(name = "计划数量(箱)")
|
||||
private String quantityX;
|
||||
|
||||
/** 计划数量(件) */
|
||||
@Excel(name = "计划数量(件)")
|
||||
private String quantityJ;
|
||||
|
||||
/** 参考单价 */
|
||||
@Excel(name = "参考单价")
|
||||
private String price;
|
||||
|
||||
/** 品牌 */
|
||||
@Excel(name = "品牌")
|
||||
private String cargoNo;
|
||||
|
||||
/** 实际数量 */
|
||||
@Excel(name = "实际数量")
|
||||
private String assignNum;
|
||||
|
||||
/** 实际数量(箱) */
|
||||
@Excel(name = "实际数量(箱)")
|
||||
private String assignNumX;
|
||||
|
||||
/** 实际数量(件) */
|
||||
@Excel(name = "实际数量(件)")
|
||||
private String assignNumJ;
|
||||
|
||||
/** 入库日期 */
|
||||
@Excel(name = "入库日期")
|
||||
private String printDate;
|
||||
|
||||
/** 单据状态 */
|
||||
@Excel(name = "单据状态")
|
||||
private String stockStatus;
|
||||
|
||||
/** 供应商编码 */
|
||||
@Excel(name = "供应商编码")
|
||||
private String supplierId;
|
||||
|
||||
/** 客户编码 */
|
||||
@Excel(name = "客户编码")
|
||||
private String customerId;
|
||||
|
||||
/** 单位 */
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
/** 规格 */
|
||||
@Excel(name = "规格")
|
||||
private String spec;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String spare1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String spare3;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
private String spare4;
|
||||
|
||||
/** 备用字段5 */
|
||||
@Excel(name = "备用字段5")
|
||||
private String spare5;
|
||||
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段6")
|
||||
private String spare6;
|
||||
|
||||
public void setStockinDetailId(String stockinDetailId)
|
||||
{
|
||||
this.stockinDetailId = stockinDetailId;
|
||||
}
|
||||
|
||||
public String getStockinDetailId()
|
||||
{
|
||||
return stockinDetailId;
|
||||
}
|
||||
|
||||
public void setStockinGuid(String stockinGuid)
|
||||
{
|
||||
this.stockinGuid = stockinGuid;
|
||||
}
|
||||
|
||||
public String getStockinGuid()
|
||||
{
|
||||
return stockinGuid;
|
||||
}
|
||||
|
||||
public void setStockinId(String stockinId)
|
||||
{
|
||||
this.stockinId = stockinId;
|
||||
}
|
||||
|
||||
public String getStockinId()
|
||||
{
|
||||
return stockinId;
|
||||
}
|
||||
|
||||
public void setLotNo(String lotNo)
|
||||
{
|
||||
this.lotNo = lotNo;
|
||||
}
|
||||
|
||||
public String getLotNo()
|
||||
{
|
||||
return lotNo;
|
||||
}
|
||||
|
||||
public void setProductGuid(String productGuid)
|
||||
{
|
||||
this.productGuid = productGuid;
|
||||
}
|
||||
|
||||
public String getProductGuid()
|
||||
{
|
||||
return productGuid;
|
||||
}
|
||||
|
||||
public void setProductId(String productId)
|
||||
{
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductId()
|
||||
{
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setQuantity(String quantity)
|
||||
{
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public String getQuantity()
|
||||
{
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantityX(String quantityX)
|
||||
{
|
||||
this.quantityX = quantityX;
|
||||
}
|
||||
|
||||
public String getQuantityX()
|
||||
{
|
||||
return quantityX;
|
||||
}
|
||||
|
||||
public void setQuantityJ(String quantityJ)
|
||||
{
|
||||
this.quantityJ = quantityJ;
|
||||
}
|
||||
|
||||
public String getQuantityJ()
|
||||
{
|
||||
return quantityJ;
|
||||
}
|
||||
|
||||
public void setPrice(String price)
|
||||
{
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
public String getPrice()
|
||||
{
|
||||
return price;
|
||||
}
|
||||
|
||||
public void setCargoNo(String cargoNo)
|
||||
{
|
||||
this.cargoNo = cargoNo;
|
||||
}
|
||||
|
||||
public String getCargoNo()
|
||||
{
|
||||
return cargoNo;
|
||||
}
|
||||
|
||||
public void setAssignNum(String assignNum)
|
||||
{
|
||||
this.assignNum = assignNum;
|
||||
}
|
||||
|
||||
public String getAssignNum()
|
||||
{
|
||||
return assignNum;
|
||||
}
|
||||
|
||||
public void setAssignNumX(String assignNumX)
|
||||
{
|
||||
this.assignNumX = assignNumX;
|
||||
}
|
||||
|
||||
public String getAssignNumX()
|
||||
{
|
||||
return assignNumX;
|
||||
}
|
||||
|
||||
public void setAssignNumJ(String assignNumJ)
|
||||
{
|
||||
this.assignNumJ = assignNumJ;
|
||||
}
|
||||
|
||||
public String getAssignNumJ()
|
||||
{
|
||||
return assignNumJ;
|
||||
}
|
||||
|
||||
public void setPrintDate(String printDate)
|
||||
{
|
||||
this.printDate = printDate;
|
||||
}
|
||||
|
||||
public String getPrintDate()
|
||||
{
|
||||
return printDate;
|
||||
}
|
||||
|
||||
public void setStockStatus(String stockStatus)
|
||||
{
|
||||
this.stockStatus = stockStatus;
|
||||
}
|
||||
|
||||
public String getStockStatus()
|
||||
{
|
||||
return stockStatus;
|
||||
}
|
||||
|
||||
public void setSupplierId(String supplierId)
|
||||
{
|
||||
this.supplierId = supplierId;
|
||||
}
|
||||
|
||||
public String getSupplierId()
|
||||
{
|
||||
return supplierId;
|
||||
}
|
||||
|
||||
public void setCustomerId(String customerId)
|
||||
{
|
||||
this.customerId = customerId;
|
||||
}
|
||||
|
||||
public String getCustomerId()
|
||||
{
|
||||
return customerId;
|
||||
}
|
||||
|
||||
public void setUnit(String unit)
|
||||
{
|
||||
this.unit = unit;
|
||||
}
|
||||
|
||||
public String getUnit()
|
||||
{
|
||||
return unit;
|
||||
}
|
||||
|
||||
public void setSpec(String spec)
|
||||
{
|
||||
this.spec = spec;
|
||||
}
|
||||
|
||||
public String getSpec()
|
||||
{
|
||||
return spec;
|
||||
}
|
||||
|
||||
public void setSpare1(String spare1)
|
||||
{
|
||||
this.spare1 = spare1;
|
||||
}
|
||||
|
||||
public String getSpare1()
|
||||
{
|
||||
return spare1;
|
||||
}
|
||||
|
||||
public void setSpare2(String spare2)
|
||||
{
|
||||
this.spare2 = spare2;
|
||||
}
|
||||
|
||||
public String getSpare2()
|
||||
{
|
||||
return spare2;
|
||||
}
|
||||
|
||||
public void setSpare3(String spare3)
|
||||
{
|
||||
this.spare3 = spare3;
|
||||
}
|
||||
|
||||
public String getSpare3()
|
||||
{
|
||||
return spare3;
|
||||
}
|
||||
|
||||
public void setSpare4(String spare4)
|
||||
{
|
||||
this.spare4 = spare4;
|
||||
}
|
||||
|
||||
public String getSpare4()
|
||||
{
|
||||
return spare4;
|
||||
}
|
||||
|
||||
public void setSpare5(String spare5)
|
||||
{
|
||||
this.spare5 = spare5;
|
||||
}
|
||||
|
||||
public String getSpare5()
|
||||
{
|
||||
return spare5;
|
||||
}
|
||||
|
||||
public void setSpare6(String spare6)
|
||||
{
|
||||
this.spare6 = spare6;
|
||||
}
|
||||
|
||||
public String getSpare6()
|
||||
{
|
||||
return spare6;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("stockinDetailId", getStockinDetailId())
|
||||
.append("stockinGuid", getStockinGuid())
|
||||
.append("stockinId", getStockinId())
|
||||
.append("lotNo", getLotNo())
|
||||
.append("productGuid", getProductGuid())
|
||||
.append("productId", getProductId())
|
||||
.append("quantity", getQuantity())
|
||||
.append("quantityX", getQuantityX())
|
||||
.append("quantityJ", getQuantityJ())
|
||||
.append("price", getPrice())
|
||||
.append("cargoNo", getCargoNo())
|
||||
.append("remark", getRemark())
|
||||
.append("assignNum", getAssignNum())
|
||||
.append("assignNumX", getAssignNumX())
|
||||
.append("assignNumJ", getAssignNumJ())
|
||||
.append("printDate", getPrintDate())
|
||||
.append("stockStatus", getStockStatus())
|
||||
.append("supplierId", getSupplierId())
|
||||
.append("customerId", getCustomerId())
|
||||
.append("unit", getUnit())
|
||||
.append("spec", getSpec())
|
||||
.append("spare1", getSpare1())
|
||||
.append("spare2", getSpare2())
|
||||
.append("spare3", getSpare3())
|
||||
.append("spare4", getSpare4())
|
||||
.append("spare5", getSpare5())
|
||||
.append("spare6", getSpare6())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.ruoyi.receive.stockindetailfinish.mapper;
|
||||
|
||||
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
|
||||
import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 历史接收单据子信息Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
public interface ReceiveStockinDetailFinishMapper
|
||||
{
|
||||
/**
|
||||
* 查询历史接收单据子信息
|
||||
*
|
||||
* @param stockinDetailId 历史接收单据子信息主键
|
||||
* @return 历史接收单据子信息
|
||||
*/
|
||||
public ReceiveStockinDetailFinish selectReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId);
|
||||
|
||||
/**
|
||||
* 查询历史接收单据子信息列表
|
||||
*
|
||||
* @param receiveStockinDetailFinish 历史接收单据子信息
|
||||
* @return 历史接收单据子信息集合
|
||||
*/
|
||||
public List<ReceiveStockinDetailFinish> selectReceiveStockinDetailFinishList(ReceiveStockinDetailFinish receiveStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 新增历史接收单据子信息
|
||||
*
|
||||
* @param receiveStockinDetailFinish 历史接收单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 修改历史接收单据子信息
|
||||
*
|
||||
* @param receiveStockinDetailFinish 历史接收单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 删除历史接收单据子信息
|
||||
*
|
||||
* @param stockinDetailId 历史接收单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId);
|
||||
|
||||
/**
|
||||
* 批量删除历史接收单据子信息
|
||||
*
|
||||
* @param stockinDetailIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds);
|
||||
|
||||
List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail);
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.ruoyi.receive.stockindetailfinish.service;
|
||||
|
||||
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
|
||||
import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 历史接收单据子信息Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
public interface IReceiveStockinDetailFinishService
|
||||
{
|
||||
/**
|
||||
* 查询历史接收单据子信息
|
||||
*
|
||||
* @param stockinDetailId 历史接收单据子信息主键
|
||||
* @return 历史接收单据子信息
|
||||
*/
|
||||
public ReceiveStockinDetailFinish selectReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId);
|
||||
|
||||
/**
|
||||
* 查询历史接收单据子信息列表
|
||||
*
|
||||
* @param receiveStockinDetailFinish 历史接收单据子信息
|
||||
* @return 历史接收单据子信息集合
|
||||
*/
|
||||
public List<ReceiveStockinDetailFinish> selectReceiveStockinDetailFinishList(ReceiveStockinDetailFinish receiveStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 新增历史接收单据子信息
|
||||
*
|
||||
* @param receiveStockinDetailFinish 历史接收单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 修改历史接收单据子信息
|
||||
*
|
||||
* @param receiveStockinDetailFinish 历史接收单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 批量删除历史接收单据子信息
|
||||
*
|
||||
* @param stockinDetailIds 需要删除的历史接收单据子信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds);
|
||||
|
||||
/**
|
||||
* 删除历史接收单据子信息信息
|
||||
*
|
||||
* @param stockinDetailId 历史接收单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId);
|
||||
|
||||
List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail);
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
package com.ruoyi.receive.stockindetailfinish.service.impl;
|
||||
|
||||
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
|
||||
import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
|
||||
import com.ruoyi.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper;
|
||||
import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinishService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 历史接收单据子信息Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
@Service
|
||||
public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDetailFinishService
|
||||
{
|
||||
@Autowired
|
||||
private ReceiveStockinDetailFinishMapper receiveStockinDetailFinishMapper;
|
||||
|
||||
/**
|
||||
* 查询历史接收单据子信息
|
||||
*
|
||||
* @param stockinDetailId 历史接收单据子信息主键
|
||||
* @return 历史接收单据子信息
|
||||
*/
|
||||
@Override
|
||||
public ReceiveStockinDetailFinish selectReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId)
|
||||
{
|
||||
return receiveStockinDetailFinishMapper.selectReceiveStockinDetailFinishByStockinDetailId(stockinDetailId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询历史接收单据子信息列表
|
||||
*
|
||||
* @param receiveStockinDetailFinish 历史接收单据子信息
|
||||
* @return 历史接收单据子信息
|
||||
*/
|
||||
@Override
|
||||
public List<ReceiveStockinDetailFinish> selectReceiveStockinDetailFinishList(ReceiveStockinDetailFinish receiveStockinDetailFinish)
|
||||
{
|
||||
return receiveStockinDetailFinishMapper.selectReceiveStockinDetailFinishList(receiveStockinDetailFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增历史接收单据子信息
|
||||
*
|
||||
* @param receiveStockinDetailFinish 历史接收单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish)
|
||||
{
|
||||
return receiveStockinDetailFinishMapper.insertReceiveStockinDetailFinish(receiveStockinDetailFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改历史接收单据子信息
|
||||
*
|
||||
* @param receiveStockinDetailFinish 历史接收单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish)
|
||||
{
|
||||
return receiveStockinDetailFinishMapper.updateReceiveStockinDetailFinish(receiveStockinDetailFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除历史接收单据子信息
|
||||
*
|
||||
* @param stockinDetailIds 需要删除的历史接收单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds)
|
||||
{
|
||||
return receiveStockinDetailFinishMapper.deleteReceiveStockinDetailFinishByStockinDetailIds(stockinDetailIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除历史接收单据子信息信息
|
||||
*
|
||||
* @param stockinDetailId 历史接收单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId)
|
||||
{
|
||||
return receiveStockinDetailFinishMapper.deleteReceiveStockinDetailFinishByStockinDetailId(stockinDetailId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) {
|
||||
|
||||
return receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
package com.ruoyi.receive.stockinfinish.controller;
|
||||
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
|
||||
import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 历史接收单据主信息Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/receive/stockinFinish")
|
||||
public class ReceiveStockinFinishController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IReceiveStockinFinishService receiveStockinFinishService;
|
||||
|
||||
/**
|
||||
* 查询历史接收单据主信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinFinish:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(ReceiveStockinFinish receiveStockinFinish)
|
||||
{
|
||||
startPage();
|
||||
List<ReceiveStockinFinish> list = receiveStockinFinishService.selectReceiveStockinFinishList(receiveStockinFinish);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出历史接收单据主信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinFinish:export')")
|
||||
@Log(title = "历史接收单据主信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, ReceiveStockinFinish receiveStockinFinish)
|
||||
{
|
||||
List<ReceiveStockinFinish> list = receiveStockinFinishService.selectReceiveStockinFinishList(receiveStockinFinish);
|
||||
ExcelUtil<ReceiveStockinFinish> util = new ExcelUtil<ReceiveStockinFinish>(ReceiveStockinFinish.class);
|
||||
util.exportExcel(response, list, "历史接收单据主信息数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取历史接收单据主信息详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinFinish:query')")
|
||||
@GetMapping(value = "/{stockinGuid}")
|
||||
public AjaxResult getInfo(@PathVariable("stockinGuid") String stockinGuid)
|
||||
{
|
||||
return success(receiveStockinFinishService.selectReceiveStockinFinishByStockinGuid(stockinGuid));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增历史接收单据主信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinFinish:add')")
|
||||
@Log(title = "历史接收单据主信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody ReceiveStockinFinish receiveStockinFinish)
|
||||
{
|
||||
return toAjax(receiveStockinFinishService.insertReceiveStockinFinish(receiveStockinFinish));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改历史接收单据主信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinFinish:edit')")
|
||||
@Log(title = "历史接收单据主信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody ReceiveStockinFinish receiveStockinFinish)
|
||||
{
|
||||
return toAjax(receiveStockinFinishService.updateReceiveStockinFinish(receiveStockinFinish));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除历史接收单据主信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('receive:stockinFinish:remove')")
|
||||
@Log(title = "历史接收单据主信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stockinGuids}")
|
||||
public AjaxResult remove(@PathVariable String[] stockinGuids)
|
||||
{
|
||||
return toAjax(receiveStockinFinishService.deleteReceiveStockinFinishByStockinGuids(stockinGuids));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,307 @@
|
||||
package com.ruoyi.receive.stockinfinish.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
/**
|
||||
* 历史接收单据主信息对象 receive_stockin_finish
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
public class ReceiveStockinFinish extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** GUID */
|
||||
private String stockinGuid;
|
||||
|
||||
/** 入库订单ID */
|
||||
@Excel(name = "入库订单ID")
|
||||
private String stockinId;
|
||||
|
||||
/** 入库类型 */
|
||||
@Excel(name = "入库类型")
|
||||
private String inType;
|
||||
|
||||
/** 建立时间 */
|
||||
@Excel(name = "建立时间")
|
||||
private String createDate;
|
||||
|
||||
/** 创建人 */
|
||||
@Excel(name = "创建人")
|
||||
private String createManId;
|
||||
|
||||
/** 单据状态 */
|
||||
@Excel(name = "单据状态")
|
||||
private String status;
|
||||
|
||||
/** 仓库ID */
|
||||
@Excel(name = "仓库ID")
|
||||
private String warehouseId;
|
||||
|
||||
/** 备用字段5 */
|
||||
@Excel(name = "备用字段5")
|
||||
private String spare5;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
private String spare4;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String spare3;
|
||||
|
||||
/** 完成日期 */
|
||||
@Excel(name = " 完成日期")
|
||||
private String finishDate;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String spare1;
|
||||
|
||||
/** erp单号 */
|
||||
@Excel(name = "erp单号")
|
||||
private String erpBill;
|
||||
|
||||
/** 单据来源 */
|
||||
@Excel(name = "单据来源")
|
||||
private String stockSource;
|
||||
|
||||
/** 部门编码 */
|
||||
@Excel(name = "部门编码")
|
||||
private String departmentNo;
|
||||
|
||||
/** 客户编码 */
|
||||
@Excel(name = "客户编码")
|
||||
private String customerNo;
|
||||
|
||||
/** 班组编码 */
|
||||
@Excel(name = "班组编码")
|
||||
private String classNo;
|
||||
|
||||
/** 供应商编码 */
|
||||
@Excel(name = "供应商编码")
|
||||
private String supplierNo;
|
||||
|
||||
public void setStockinGuid(String stockinGuid)
|
||||
{
|
||||
this.stockinGuid = stockinGuid;
|
||||
}
|
||||
|
||||
public String getStockinGuid()
|
||||
{
|
||||
return stockinGuid;
|
||||
}
|
||||
|
||||
public void setStockinId(String stockinId)
|
||||
{
|
||||
this.stockinId = stockinId;
|
||||
}
|
||||
|
||||
public String getStockinId()
|
||||
{
|
||||
return stockinId;
|
||||
}
|
||||
|
||||
public void setInType(String inType)
|
||||
{
|
||||
this.inType = inType;
|
||||
}
|
||||
|
||||
public String getInType()
|
||||
{
|
||||
return inType;
|
||||
}
|
||||
|
||||
public void setCreateDate(String createDate)
|
||||
{
|
||||
this.createDate = createDate;
|
||||
}
|
||||
|
||||
public String getCreateDate()
|
||||
{
|
||||
return createDate;
|
||||
}
|
||||
|
||||
public void setCreateManId(String createManId)
|
||||
{
|
||||
this.createManId = createManId;
|
||||
}
|
||||
|
||||
public String getCreateManId()
|
||||
{
|
||||
return createManId;
|
||||
}
|
||||
|
||||
public void setStatus(String status)
|
||||
{
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getStatus()
|
||||
{
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setWarehouseId(String warehouseId)
|
||||
{
|
||||
this.warehouseId = warehouseId;
|
||||
}
|
||||
|
||||
public String getWarehouseId()
|
||||
{
|
||||
return warehouseId;
|
||||
}
|
||||
|
||||
public void setSpare5(String spare5)
|
||||
{
|
||||
this.spare5 = spare5;
|
||||
}
|
||||
|
||||
public String getSpare5()
|
||||
{
|
||||
return spare5;
|
||||
}
|
||||
|
||||
public void setSpare4(String spare4)
|
||||
{
|
||||
this.spare4 = spare4;
|
||||
}
|
||||
|
||||
public String getSpare4()
|
||||
{
|
||||
return spare4;
|
||||
}
|
||||
|
||||
public void setSpare3(String spare3)
|
||||
{
|
||||
this.spare3 = spare3;
|
||||
}
|
||||
|
||||
public String getSpare3()
|
||||
{
|
||||
return spare3;
|
||||
}
|
||||
|
||||
public void setFinishDate(String finishDate)
|
||||
{
|
||||
this.finishDate = finishDate;
|
||||
}
|
||||
|
||||
public String getFinishDate()
|
||||
{
|
||||
return finishDate;
|
||||
}
|
||||
|
||||
public void setSpare2(String spare2)
|
||||
{
|
||||
this.spare2 = spare2;
|
||||
}
|
||||
|
||||
public String getSpare2()
|
||||
{
|
||||
return spare2;
|
||||
}
|
||||
|
||||
public void setSpare1(String spare1)
|
||||
{
|
||||
this.spare1 = spare1;
|
||||
}
|
||||
|
||||
public String getSpare1()
|
||||
{
|
||||
return spare1;
|
||||
}
|
||||
|
||||
public void setErpBill(String erpBill)
|
||||
{
|
||||
this.erpBill = erpBill;
|
||||
}
|
||||
|
||||
public String getErpBill()
|
||||
{
|
||||
return erpBill;
|
||||
}
|
||||
|
||||
public void setStockSource(String stockSource)
|
||||
{
|
||||
this.stockSource = stockSource;
|
||||
}
|
||||
|
||||
public String getStockSource()
|
||||
{
|
||||
return stockSource;
|
||||
}
|
||||
|
||||
public void setDepartmentNo(String departmentNo)
|
||||
{
|
||||
this.departmentNo = departmentNo;
|
||||
}
|
||||
|
||||
public String getDepartmentNo()
|
||||
{
|
||||
return departmentNo;
|
||||
}
|
||||
|
||||
public void setCustomerNo(String customerNo)
|
||||
{
|
||||
this.customerNo = customerNo;
|
||||
}
|
||||
|
||||
public String getCustomerNo()
|
||||
{
|
||||
return customerNo;
|
||||
}
|
||||
|
||||
public void setClassNo(String classNo)
|
||||
{
|
||||
this.classNo = classNo;
|
||||
}
|
||||
|
||||
public String getClassNo()
|
||||
{
|
||||
return classNo;
|
||||
}
|
||||
|
||||
public void setSupplierNo(String supplierNo)
|
||||
{
|
||||
this.supplierNo = supplierNo;
|
||||
}
|
||||
|
||||
public String getSupplierNo()
|
||||
{
|
||||
return supplierNo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("stockinGuid", getStockinGuid())
|
||||
.append("stockinId", getStockinId())
|
||||
.append("inType", getInType())
|
||||
.append("createDate", getCreateDate())
|
||||
.append("createManId", getCreateManId())
|
||||
.append("status", getStatus())
|
||||
.append("warehouseId", getWarehouseId())
|
||||
.append("spare5", getSpare5())
|
||||
.append("spare4", getSpare4())
|
||||
.append("spare3", getSpare3())
|
||||
.append("finishDate", getFinishDate())
|
||||
.append("spare2", getSpare2())
|
||||
.append("spare1", getSpare1())
|
||||
.append("erpBill", getErpBill())
|
||||
.append("stockSource", getStockSource())
|
||||
.append("departmentNo", getDepartmentNo())
|
||||
.append("customerNo", getCustomerNo())
|
||||
.append("classNo", getClassNo())
|
||||
.append("supplierNo", getSupplierNo())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.ruoyi.receive.stockinfinish.mapper;
|
||||
|
||||
import com.ruoyi.receive.stockin.domain.ReceiveStockin;
|
||||
import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 历史接收单据主信息Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
public interface ReceiveStockinFinishMapper
|
||||
{
|
||||
/**
|
||||
* 查询历史接收单据主信息
|
||||
*
|
||||
* @param stockinGuid 历史接收单据主信息主键
|
||||
* @return 历史接收单据主信息
|
||||
*/
|
||||
public ReceiveStockinFinish selectReceiveStockinFinishByStockinGuid(String stockinGuid);
|
||||
|
||||
/**
|
||||
* 查询历史接收单据主信息列表
|
||||
*
|
||||
* @param receiveStockinFinish 历史接收单据主信息
|
||||
* @return 历史接收单据主信息集合
|
||||
*/
|
||||
public List<ReceiveStockinFinish> selectReceiveStockinFinishList(ReceiveStockinFinish receiveStockinFinish);
|
||||
|
||||
/**
|
||||
* 新增历史接收单据主信息
|
||||
*
|
||||
* @param receiveStockinFinish 历史接收单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish);
|
||||
|
||||
/**
|
||||
* 修改历史接收单据主信息
|
||||
*
|
||||
* @param receiveStockinFinish 历史接收单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish);
|
||||
|
||||
/**
|
||||
* 删除历史接收单据主信息
|
||||
*
|
||||
* @param stockinGuid 历史接收单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid);
|
||||
|
||||
/**
|
||||
* 批量删除历史接收单据主信息
|
||||
*
|
||||
* @param stockinGuids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids);
|
||||
|
||||
List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin);
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.ruoyi.receive.stockinfinish.service;
|
||||
|
||||
import com.ruoyi.receive.stockin.domain.ReceiveStockin;
|
||||
import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 历史接收单据主信息Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
public interface IReceiveStockinFinishService
|
||||
{
|
||||
/**
|
||||
* 查询历史接收单据主信息
|
||||
*
|
||||
* @param stockinGuid 历史接收单据主信息主键
|
||||
* @return 历史接收单据主信息
|
||||
*/
|
||||
public ReceiveStockinFinish selectReceiveStockinFinishByStockinGuid(String stockinGuid);
|
||||
|
||||
/**
|
||||
* 查询历史接收单据主信息列表
|
||||
*
|
||||
* @param receiveStockinFinish 历史接收单据主信息
|
||||
* @return 历史接收单据主信息集合
|
||||
*/
|
||||
public List<ReceiveStockinFinish> selectReceiveStockinFinishList(ReceiveStockinFinish receiveStockinFinish);
|
||||
|
||||
/**
|
||||
* 新增历史接收单据主信息
|
||||
*
|
||||
* @param receiveStockinFinish 历史接收单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish);
|
||||
|
||||
/**
|
||||
* 修改历史接收单据主信息
|
||||
*
|
||||
* @param receiveStockinFinish 历史接收单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish);
|
||||
|
||||
/**
|
||||
* 批量删除历史接收单据主信息
|
||||
*
|
||||
* @param stockinGuids 需要删除的历史接收单据主信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids);
|
||||
|
||||
/**
|
||||
* 删除历史接收单据主信息信息
|
||||
*
|
||||
* @param stockinGuid 历史接收单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid);
|
||||
|
||||
List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin);
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
package com.ruoyi.receive.stockinfinish.service.impl;
|
||||
|
||||
import com.ruoyi.common.annotation.DataScope;
|
||||
import com.ruoyi.receive.stockin.domain.ReceiveStockin;
|
||||
import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
|
||||
import com.ruoyi.receive.stockinfinish.mapper.ReceiveStockinFinishMapper;
|
||||
import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 历史接收单据主信息Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
@Service
|
||||
public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishService
|
||||
{
|
||||
@Autowired
|
||||
private ReceiveStockinFinishMapper receiveStockinFinishMapper;
|
||||
|
||||
/**
|
||||
* 查询历史接收单据主信息
|
||||
*
|
||||
* @param stockinGuid 历史接收单据主信息主键
|
||||
* @return 历史接收单据主信息
|
||||
*/
|
||||
@Override
|
||||
public ReceiveStockinFinish selectReceiveStockinFinishByStockinGuid(String stockinGuid)
|
||||
{
|
||||
return receiveStockinFinishMapper.selectReceiveStockinFinishByStockinGuid(stockinGuid);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询历史接收单据主信息列表
|
||||
*
|
||||
* @param receiveStockinFinish 历史接收单据主信息
|
||||
* @return 历史接收单据主信息
|
||||
*/
|
||||
@Override
|
||||
public List<ReceiveStockinFinish> selectReceiveStockinFinishList(ReceiveStockinFinish receiveStockinFinish)
|
||||
{
|
||||
return receiveStockinFinishMapper.selectReceiveStockinFinishList(receiveStockinFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增历史接收单据主信息
|
||||
*
|
||||
* @param receiveStockinFinish 历史接收单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish)
|
||||
{
|
||||
return receiveStockinFinishMapper.insertReceiveStockinFinish(receiveStockinFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改历史接收单据主信息
|
||||
*
|
||||
* @param receiveStockinFinish 历史接收单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish)
|
||||
{
|
||||
return receiveStockinFinishMapper.updateReceiveStockinFinish(receiveStockinFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除历史接收单据主信息
|
||||
*
|
||||
* @param stockinGuids 需要删除的历史接收单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids)
|
||||
{
|
||||
return receiveStockinFinishMapper.deleteReceiveStockinFinishByStockinGuids(stockinGuids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除历史接收单据主信息信息
|
||||
*
|
||||
* @param stockinGuid 历史接收单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid)
|
||||
{
|
||||
return receiveStockinFinishMapper.deleteReceiveStockinFinishByStockinGuid(stockinGuid);
|
||||
}
|
||||
|
||||
@Override
|
||||
@DataScope(warehouseAlias = "rs")
|
||||
public List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin) {
|
||||
return receiveStockinFinishMapper.selectReceiveStockinList(receiveStockin);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user