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

获取入库子单和主单

Browse Source
This commit is contained in:
lsymicc
2025-12-08 15:24:35 +08:00
parent 0ad1b6b601
commit 12a3e92039
15 changed files with 290 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/controller/ErpInStockinController.java
View File

@@ -66,7 +66,7 @@ public class ErpInStockinController extends BaseController
@GetMapping(value = "/{title}")
public AjaxResult getInfo(@PathVariable("title") String title)
{
return success(erpInStockinService.selectErpInStockinByTitle(title));
return success(erpInStockinService.selectErpInStockinByKuin(title));
}
/**
@@ -97,8 +97,8 @@ public class ErpInStockinController extends BaseController
@PreAuthorize("@ss.hasPermi('in:ErpInStockin:remove')")
@Log(title = "入库主表单", businessType = BusinessType.DELETE)
@DeleteMapping("/{titles}")
public AjaxResult remove(@PathVariable String[] titles)
public AjaxResult remove(@PathVariable String[] kuins)
{
return toAjax(erpInStockinService.deleteErpInStockinByTitles(titles));
return toAjax(erpInStockinService.deleteErpInStockinByKuins(kuins));
}
}

3
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/domain/ErpInStockin.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.in.ErpInStockin.domain;
import cn.hutool.core.annotation.Alias;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -11,6 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2025-12-08
*/
@Data
public class ErpInStockin extends BaseEntity
{
private static final long serialVersionUID = 1L;

24
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/mapper/ErpInStockinMapper.java
View File

@@ -14,10 +14,10 @@ public interface ErpInStockinMapper
/**
* 查询入库主表单
*
* @param title 入库主表单主键
* @param kuin 入库主表单主键
* @return 入库主表单
*/
public ErpInStockin selectErpInStockinByTitle(String title);
public ErpInStockin selectErpInStockinByKuin(String kuin);
/**
* 查询入库主表单列表
@@ -44,18 +44,26 @@ public interface ErpInStockinMapper
public int updateErpInStockin(ErpInStockin erpInStockin);
/**
* 删除入库主表单
*
* @param title 入库主表单主键
* 插入/修改入库主表单
*
* @param erpInStockin 入库主表单
* @return 结果
*/
public int deleteErpInStockinByTitle(String title);
public int upsertErpInStockin(ErpInStockin erpInStockin);
/**
* 删除入库主表单
*
* @param kuin 入库主表单主键
* @return 结果
*/
public int deleteErpInStockinByKuin(String kuin);
/**
* 批量删除入库主表单
*
* @param titles 需要删除的数据主键集合
* @param kuins 需要删除的数据主键集合
* @return 结果
*/
public int deleteErpInStockinByTitles(String[] titles);
public int deleteErpInStockinByKuins(String[] kuins);
}

24
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/IErpInStockinService.java
View File

@@ -14,10 +14,10 @@ public interface IErpInStockinService
/**
* 查询入库主表单
*
* @param title 入库主表单主键
* @param kuin 入库主表单主键
* @return 入库主表单
*/
public ErpInStockin selectErpInStockinByTitle(String title);
public ErpInStockin selectErpInStockinByKuin(String kuin);
/**
* 查询入库主表单列表
@@ -44,18 +44,26 @@ public interface IErpInStockinService
public int updateErpInStockin(ErpInStockin erpInStockin);
/**
* 批量删除入库主表单
*
* @param titles 需要删除的入库主表单主键集合
* 插入/修改入库主表单
*
* @param erpInStockin 入库主表单
* @return 结果
*/
public int deleteErpInStockinByTitles(String[] titles);
public int upsertErpInStockin(ErpInStockin erpInStockin);
/**
* 批量删除入库主表单
*
* @param kuins 需要删除的入库主表单主键集合
* @return 结果
*/
public int deleteErpInStockinByKuins(String[] kuins);
/**
* 删除入库主表单信息
*
* @param title 入库主表单主键
* @param kuin 入库主表单主键
* @return 结果
*/
public int deleteErpInStockinByTitle(String title);
public int deleteErpInStockinByKuin(String kuin);
}

33
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/impl/ErpInStockinServiceImpl.java
View File

@@ -22,13 +22,13 @@ public class ErpInStockinServiceImpl implements IErpInStockinService
/**
* 查询入库主表单
*
* @param title 入库主表单主键
* @param stockinId 入库主表单主键
* @return 入库主表单
*/
@Override
public ErpInStockin selectErpInStockinByTitle(String title)
public ErpInStockin selectErpInStockinByKuin(String stockinId)
{
return erpInStockinMapper.selectErpInStockinByTitle(title);
return erpInStockinMapper.selectErpInStockinByKuin(stockinId);
}
/**
@@ -68,26 +68,37 @@ public class ErpInStockinServiceImpl implements IErpInStockinService
}
/**
* 批量删除入库主表单
*
* @param titles 需要删除的入库主表单主键
* 插入/修改入库主表单
*
* @param erpInStockin 入库主表单
* @return 结果
*/
@Override
public int deleteErpInStockinByTitles(String[] titles)
public int upsertErpInStockin(ErpInStockin erpInStockin)
{
return erpInStockinMapper.deleteErpInStockinByTitles(titles);
return erpInStockinMapper.upsertErpInStockin(erpInStockin);
}
/**
* 批量删除入库主表单
*
* @param stockinIds 需要删除的入库主表单主键
* @return 结果
*/
@Override
public int deleteErpInStockinByKuins(String[] kuins)
{
return erpInStockinMapper.deleteErpInStockinByKuins(kuins);
}
/**
* 删除入库主表单信息
*
* @param title 入库主表单主键
* @param stockinId 入库主表单主键
* @return 结果
*/
@Override
public int deleteErpInStockinByTitle(String title)
public int deleteErpInStockinByKuin(String kuin)
{
return erpInStockinMapper.deleteErpInStockinByTitle(title);
return erpInStockinMapper.deleteErpInStockinByKuin(kuin);
}
}

16
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/domain/ErpInStockinDetail.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.in.ErpInStockinDetail.domain;
import cn.hutool.core.annotation.Alias;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -11,6 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2025-12-08
*/
@Data
public class ErpInStockinDetail extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -70,6 +73,19 @@ public class ErpInStockinDetail extends BaseEntity
@Excel(name = "入库编号", readConverterExp = "关=联主单")
private String rkbh;
/**
* 产品类型 - product_name
*/
private String spare1;
/**
* 产品型号 - product_id
*/
private String spare2;
private String spare3;
private String spare4;
private String spare5;
public void setId(Long id)
{
this.id = id;

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

@@ -1,17 +1,13 @@
package com.ruoyi.in.stockin.service.impl;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.in.stockin.mapper.InStockinMapper;