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

生成入库单据功能 接收单据质检功能

Browse Source
This commit is contained in:
liuhanqing
2025-05-22 11:33:23 +08:00
parent 6dd0f8481c
commit 20f2c73a65
27 changed files with 826 additions and 1419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
View File

@@ -78,5 +78,9 @@ public class BasProduct extends BaseEntity
* 数量
*/
private String quantity;
/**
* 批号
*/
private String lotNo;
}

19
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java
View File

@@ -2,18 +2,19 @@ package com.ruoyi.in.stockindetail.mapper;
import java.util.List;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import org.apache.ibatis.annotations.Param;
/**
* 入库单据子表Mapper接口
*
*
* @author ruoyi
* @date 2025-05-20
*/
public interface InStockinDetailMapper
public interface InStockinDetailMapper
{
/**
* 查询入库单据子表
*
*
* @param stockinDetailId 入库单据子表主键
* @return 入库单据子表
*/
@@ -21,7 +22,7 @@ public interface InStockinDetailMapper
/**
* 查询入库单据子表列表
*
*
* @param inStockinDetail 入库单据子表
* @return 入库单据子表集合
*/
@@ -29,7 +30,7 @@ public interface InStockinDetailMapper
/**
* 新增入库单据子表
*
*
* @param inStockinDetail 入库单据子表
* @return 结果
*/
@@ -37,7 +38,7 @@ public interface InStockinDetailMapper
/**
* 修改入库单据子表
*
*
* @param inStockinDetail 入库单据子表
* @return 结果
*/
@@ -45,7 +46,7 @@ public interface InStockinDetailMapper
/**
* 删除入库单据子表
*
*
* @param stockinDetailId 入库单据子表主键
* @return 结果
*/
@@ -53,9 +54,11 @@ public interface InStockinDetailMapper
/**
* 批量删除入库单据子表
*
*
* @param stockinDetailIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteInStockinDetailByStockinDetailIds(String[] stockinDetailIds);
void insertInStockinDetailList(@Param("list") List<InStockinDetail> inStockinDetailList);
}

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

@@ -5,15 +5,15 @@ import com.ruoyi.in.stockindetail.domain.InStockinDetail;
/**
* 入库单据子表Service接口
*
*
* @author ruoyi
* @date 2025-05-20
*/
public interface IInStockinDetailService
public interface IInStockinDetailService
{
/**
* 查询入库单据子表
*
*
* @param stockinDetailId 入库单据子表主键
* @return 入库单据子表
*/
@@ -21,7 +21,7 @@ public interface IInStockinDetailService
/**
* 查询入库单据子表列表
*
*
* @param inStockinDetail 入库单据子表
* @return 入库单据子表集合
*/
@@ -29,7 +29,7 @@ public interface IInStockinDetailService
/**
* 新增入库单据子表
*
*
* @param inStockinDetail 入库单据子表
* @return 结果
*/
@@ -37,7 +37,7 @@ public interface IInStockinDetailService
/**
* 修改入库单据子表
*
*
* @param inStockinDetail 入库单据子表
* @return 结果
*/
@@ -45,7 +45,7 @@ public interface IInStockinDetailService
/**
* 批量删除入库单据子表
*
*
* @param stockinDetailIds 需要删除的入库单据子表主键集合
* @return 结果
*/
@@ -53,9 +53,15 @@ public interface IInStockinDetailService
/**
* 删除入库单据子表信息
*
*
* @param stockinDetailId 入库单据子表主键
* @return 结果
*/
public int deleteInStockinDetailByStockinDetailId(String stockinDetailId);
/**
* 批量插入入库子单
* @param inStockinDetailList
*/
void insertInStockinDetailList(List<InStockinDetail> inStockinDetailList);
}

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

@@ -9,19 +9,19 @@ import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
/**
* 入库单据子表Service业务层处理
*
*
* @author ruoyi
* @date 2025-05-20
*/
@Service
public class InStockinDetailServiceImpl implements IInStockinDetailService
public class InStockinDetailServiceImpl implements IInStockinDetailService
{
@Autowired
private InStockinDetailMapper inStockinDetailMapper;
/**
* 查询入库单据子表
*
*
* @param stockinDetailId 入库单据子表主键
* @return 入库单据子表
*/
@@ -33,7 +33,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
/**
* 查询入库单据子表列表
*
*
* @param inStockinDetail 入库单据子表
* @return 入库单据子表
*/
@@ -45,7 +45,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
/**
* 新增入库单据子表
*
*
* @param inStockinDetail 入库单据子表
* @return 结果
*/
@@ -57,7 +57,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
/**
* 修改入库单据子表
*
*
* @param inStockinDetail 入库单据子表
* @return 结果
*/
@@ -69,7 +69,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
/**
* 批量删除入库单据子表
*
*
* @param stockinDetailIds 需要删除的入库单据子表主键
* @return 结果
*/
@@ -81,7 +81,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
/**
* 删除入库单据子表信息
*
*
* @param stockinDetailId 入库单据子表主键
* @return 结果
*/
@@ -90,4 +90,9 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
{
return inStockinDetailMapper.deleteInStockinDetailByStockinDetailId(stockinDetailId);
}
@Override
public void insertInStockinDetailList(List<InStockinDetail> inStockinDetailList) {
inStockinDetailMapper.insertInStockinDetailList(inStockinDetailList);
}
}

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

@@ -3,20 +3,17 @@ package com.ruoyi.receive.stockin.controller;
import java.io.IOException;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -81,11 +78,27 @@ public class ReceiveStockinController extends BaseController
@PreAuthorize("@ss.hasPermi('receive:stockin:add')")
@Log(title = "收货单据", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ReceiveStockVo receiveStockin)
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);
}
/**
* 导入收货单据
*/

5
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveProductVo.java
View File

@@ -6,16 +6,21 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.NotEmpty;
@Data
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class ReceiveProductVo {
@Excel(name = "物料编码")
@NotEmpty(message = "物料GUID不能为空")
private String productGuid;
@Excel(name = "物料数量")
@NotEmpty(message = "物料数量不能为空")
private String quantity;
@Excel(name = "批次号")
@NotEmpty(message = "批次号不能为空")
private String lotNo;

14
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveStockCreateInVo.java Normal file
View File

@@ -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;
}

15
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveStockDetailQualityInsVo.java Normal file
View File

@@ -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;
}

21
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveStockQualityInsVo.java Normal file
View File

@@ -0,0 +1,21 @@
package com.ruoyi.receive.stockin.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class ReceiveStockQualityInsVo {
private String stockinGuid;
private List<ReceiveStockDetailQualityInsVo> list;
}

6
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveStockVo.java
View File

@@ -14,11 +14,11 @@ import java.util.List;
@NoArgsConstructor
@ToString
public class ReceiveStockVo {
@NotBlank
@NotBlank(message = "仓库不能为空")
private String warehouseId;
@NotBlank
@NotBlank(message = "供应商不能为空")
private String supplierId;
private String remark;
@NotEmpty
@NotEmpty(message = "商品不能为空")
private List<ReceiveProductVo> productVoList;
}

22
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/mapper/ReceiveStockinMapper.java
View File

@@ -5,15 +5,15 @@ import com.ruoyi.receive.stockin.domain.ReceiveStockin;
/**
* 收货单据Mapper接口
*
*
* @author ruoyi
* @date 2025-05-20
*/
public interface ReceiveStockinMapper
public interface ReceiveStockinMapper
{
/**
* 查询收货单据
*
*
* @param stockinGuid 收货单据主键
* @return 收货单据
*/
@@ -21,7 +21,7 @@ public interface ReceiveStockinMapper
/**
* 查询收货单据列表
*
*
* @param receiveStockin 收货单据
* @return 收货单据集合
*/
@@ -29,7 +29,7 @@ public interface ReceiveStockinMapper
/**
* 新增收货单据
*
*
* @param receiveStockin 收货单据
* @return 结果
*/
@@ -37,7 +37,7 @@ public interface ReceiveStockinMapper
/**
* 修改收货单据
*
*
* @param receiveStockin 收货单据
* @return 结果
*/
@@ -45,7 +45,7 @@ public interface ReceiveStockinMapper
/**
* 删除收货单据
*
*
* @param stockinGuid 收货单据主键
* @return 结果
*/
@@ -53,9 +53,15 @@ public interface ReceiveStockinMapper
/**
* 批量删除收货单据
*
*
* @param stockinGuids 需要删除的数据主键集合
* @return 结果
*/
public int deleteReceiveStockinByStockinGuids(String[] stockinGuids);
/**
* 插入历史表
* @param receiveStockinGuid
*/
void insertReceiveStockinHistory(String receiveStockinGuid);
}

10
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/IReceiveStockinService.java
View File

@@ -5,6 +5,8 @@ import java.util.List;
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.ReceiveStockQualityInsVo;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
import org.springframework.web.multipart.MultipartFile;
@@ -70,4 +72,12 @@ public interface IReceiveStockinService
* @return
*/
AjaxResult analyseExportFile(List<ReceiveProductVo> list );
/**
* 创建入库单据
* @param receiveStockin
* @return
*/
AjaxResult createStockin(ReceiveStockCreateInVo receiveStockin);
}

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

@@ -1,21 +1,27 @@
package com.ruoyi.receive.stockin.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import cn.hutool.Hutool;
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 com.ruoyi.bas.BasProduct.domain.BasProduct;
import com.ruoyi.bas.BasProduct.service.IBasProductService;
import com.ruoyi.bas.basJobId.service.IBasJobIdService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
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.vo.*;
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
import com.ruoyi.receive.stockindetail.service.IReceiveStockinDetailService;
import com.ruoyi.receive.stockindetail.service.impl.ReceiveStockinDetailServiceImpl;
@@ -42,6 +48,12 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
private IReceiveStockinDetailService iReceiveStockinDetailService;
@Autowired
private IBasProductService iBasProductService;
@Autowired
private IInStockinDetailService iInStockinDetailService;
@Autowired
private IInStockinService inStockinServicel;
@Autowired
private IBasJobIdService iBasJobIdService;
/**
* 查询收货单据
@@ -90,9 +102,10 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
receiveStockin.setStockSource("1");
//receiveStockin.setSpare1(receiveStockVo.getBatchId());
receiveStockin.setCreateManId(Convert.toStr(SecurityUtils.getUserId()));
receiveStockin.setStockinId(IdUtil.fastSimpleUUID());
receiveStockin.setStockinId(iBasJobIdService.getJobId("RED"));
receiveStockin.setStatus("0");
receiveStockinMapper.insertReceiveStockin(receiveStockin);
int i = 1;
for (ReceiveProductVo receiveProductVo : productVoList) {
BasProduct basProduct = iBasProductService.selectBasProductByProductGuid(receiveProductVo.getProductGuid());
ReceiveStockinDetail receiveStockinDetail = new ReceiveStockinDetail();
@@ -101,7 +114,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
receiveStockinDetail.setProductId(basProduct.getProductId());
receiveStockinDetail.setStockinGuid(receiveStockin.getStockinGuid());
receiveStockinDetail.setStockinId(receiveStockin.getStockinId());
receiveStockinDetail.setStockinDetailId(IdUtil.fastSimpleUUID());
receiveStockinDetail.setStockinDetailId(receiveStockin.getStockinId()+"-"+i++);
receiveStockinDetail.setUnit(basProduct.getUnit());
receiveStockinDetail.setSpec(basProduct.getSpec());
receiveStockinDetail.setSpare1(basProduct.getSpare1());
@@ -170,9 +183,107 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
for (BasProduct basProduct : result) {
Optional<ReceiveProductVo> first = list.stream().filter(x -> x.getProductGuid().equals(basProduct.getProductGuid())).findFirst();
first.ifPresent(receiveProductVo -> basProduct.setQuantity(receiveProductVo.getQuantity()));
first.ifPresent(receiveProductVo -> basProduct.setLotNo(receiveProductVo.getLotNo()));
}
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();
return AjaxResult.error("编号:"+receiveStockinDetail.getProductId()+",未质检");
}
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));
}
}
}
}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");
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");
return inStockin;
}
}

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

@@ -2,6 +2,8 @@ package com.ruoyi.receive.stockindetail.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
/**
* 收货单据子单Controller
*
*
* @author ruoyi
* @date 2025-05-20
*/
@@ -101,4 +103,17 @@ public class ReceiveStockinDetailController extends BaseController
{
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);
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/mapper/ReceiveStockinDetailMapper.java
View File

@@ -58,4 +58,6 @@ public interface ReceiveStockinDetailMapper
* @return 结果
*/
public int deleteReceiveStockinDetailByStockinDetailIds(String[] stockinDetailIds);
void insertReceiveStockinDetailHistory(String receiveStockinGuid);
}

32
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/IReceiveStockinDetailService.java
View File

@@ -1,19 +1,22 @@
package com.ruoyi.receive.stockindetail.service;
import java.util.List;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
/**
* 收货单据子单Service接口
*
*
* @author ruoyi
* @date 2025-05-20
*/
public interface IReceiveStockinDetailService
public interface IReceiveStockinDetailService
{
/**
* 查询收货单据子单
*
*
* @param stockinDetailId 收货单据子单主键
* @return 收货单据子单
*/
@@ -21,7 +24,7 @@ public interface IReceiveStockinDetailService
/**
* 查询收货单据子单列表
*
*
* @param receiveStockinDetail 收货单据子单
* @return 收货单据子单集合
*/
@@ -29,7 +32,7 @@ public interface IReceiveStockinDetailService
/**
* 新增收货单据子单
*
*
* @param receiveStockinDetail 收货单据子单
* @return 结果
*/
@@ -37,7 +40,7 @@ public interface IReceiveStockinDetailService
/**
* 修改收货单据子单
*
*
* @param receiveStockinDetail 收货单据子单
* @return 结果
*/
@@ -45,7 +48,7 @@ public interface IReceiveStockinDetailService
/**
* 批量删除收货单据子单
*
*
* @param stockinDetailIds 需要删除的收货单据子单主键集合
* @return 结果
*/
@@ -53,9 +56,22 @@ public interface IReceiveStockinDetailService
/**
* 删除收货单据子单信息
*
*
* @param stockinDetailId 收货单据子单主键
* @return 结果
*/
public int deleteReceiveStockinDetailByStockinDetailId(String stockinDetailId);
/**
* 插入历史数据
* @param receiveStockinGuid
*/
void insertReceiveStockinDetailHistory(String receiveStockinGuid);
/**
* 质检收货子单据
* @param receiveStockQualityInsVo
* @return
*/
AjaxResult qualityInspection(ReceiveStockQualityInsVo receiveStockQualityInsVo);
}

44
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java
View File

@@ -1,27 +1,33 @@
package com.ruoyi.receive.stockindetail.service.impl;
import java.util.List;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockDetailQualityInsVo;
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.receive.stockindetail.mapper.ReceiveStockinDetailMapper;
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
import com.ruoyi.receive.stockindetail.service.IReceiveStockinDetailService;
import org.springframework.transaction.annotation.Transactional;
/**
* 收货单据子单Service业务层处理
*
*
* @author ruoyi
* @date 2025-05-20
*/
@Service
public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailService
public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailService
{
@Autowired
private ReceiveStockinDetailMapper receiveStockinDetailMapper;
/**
* 查询收货单据子单
*
*
* @param stockinDetailId 收货单据子单主键
* @return 收货单据子单
*/
@@ -33,7 +39,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
/**
* 查询收货单据子单列表
*
*
* @param receiveStockinDetail 收货单据子单
* @return 收货单据子单
*/
@@ -45,7 +51,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
/**
* 新增收货单据子单
*
*
* @param receiveStockinDetail 收货单据子单
* @return 结果
*/
@@ -57,7 +63,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
/**
* 修改收货单据子单
*
*
* @param receiveStockinDetail 收货单据子单
* @return 结果
*/
@@ -69,7 +75,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
/**
* 批量删除收货单据子单
*
*
* @param stockinDetailIds 需要删除的收货单据子单主键
* @return 结果
*/
@@ -81,7 +87,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
/**
* 删除收货单据子单信息
*
*
* @param stockinDetailId 收货单据子单主键
* @return 结果
*/
@@ -90,4 +96,26 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
{
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())){
return AjaxResult.error("请选择质检项");
}
for (ReceiveStockDetailQualityInsVo receiveStockDetailQualityInsVo : receiveStockQualityInsVo.getList()) {
ReceiveStockinDetail receiveStockinDetail = selectReceiveStockinDetailByStockinDetailId(receiveStockDetailQualityInsVo.getStockinDetailId());
if ("0".equals(receiveStockinDetail.getStockStatus())){
receiveStockinDetail.setQuantity(receiveStockDetailQualityInsVo.getQuantity());
receiveStockinDetail.setStockStatus("1");
updateReceiveStockinDetail(receiveStockinDetail);
}
}
return AjaxResult.success();
}
}

77
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.in.stockindetail.mapper.InStockinDetailMapper">
<resultMap type="InStockinDetail" id="InStockinDetailResult">
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockinGuid" column="stockin_guid" />
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailVo"/>
<where>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where>
</select>
<select id="selectInStockinDetailByStockinDetailId" parameterType="String" resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailVo"/>
where stockin_detail_id = #{stockinDetailId}
@@ -135,6 +135,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare6 != null">#{spare6},</if>
</trim>
</insert>
<insert id="insertInStockinDetailList">
INSERT INTO in_stockin_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<!-- 动态选择字段 -->
<if test="list[0].stockinDetailId != null">stockin_detail_id,</if>
<if test="list[0].stockinGuid != null and list[0].stockinGuid != ''">stockin_guid,</if>
<if test="list[0].stockinId != null and list[0].stockinId != ''">stockin_id,</if>
<if test="list[0].lotNo != null and list[0].lotNo != ''">lot_no,</if>
<if test="list[0].productGuid != null">product_guid,</if>
<if test="list[0].productId != null and list[0].productId != ''">product_id,</if>
<if test="list[0].quantity != null">quantity,</if>
<if test="list[0].quantityX != null">quantity_x,</if>
<if test="list[0].quantityJ != null">quantity_j,</if>
<if test="list[0].price != null">price,</if>
<if test="list[0].cargoNo != null">cargo_no,</if>
<if test="list[0].remark != null">remark,</if>
<if test="list[0].assignNum != null">assign_num,</if>
<if test="list[0].assignNumX != null">assign_num_x,</if>
<if test="list[0].assignNumJ != null">assign_num_j,</if>
<if test="list[0].printDate != null">print_date,</if>
<if test="list[0].stockStatus != null">stock_status,</if>
<if test="list[0].supplierId != null">supplier_id,</if>
<if test="list[0].customerId != null">customer_id,</if>
<if test="list[0].unit != null">unit,</if>
<if test="list[0].spec != null">spec,</if>
<if test="list[0].spare1 != null">spare1,</if>
<if test="list[0].spare2 != null">spare2,</if>
<if test="list[0].spare3 != null">spare3,</if>
<if test="list[0].spare4 != null">spare4,</if>
<if test="list[0].spare5 != null">spare5,</if>
<if test="list[0].spare6 != null">spare6,</if>
</trim>
<!-- values 部分：遍历列表插入多行 -->
VALUES
<foreach collection="list" item="item" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="item.stockinDetailId != null">#{item.stockinDetailId},</if>
<if test="item.stockinGuid != null and item.stockinGuid != ''">#{item.stockinGuid},</if>
<if test="item.stockinId != null and item.stockinId != ''">#{item.stockinId},</if>
<if test="item.lotNo != null and item.lotNo != ''">#{item.lotNo},</if>
<if test="item.productGuid != null">#{item.productGuid},</if>
<if test="item.productId != null and item.productId != ''">#{item.productId},</if>
<if test="item.quantity != null">#{item.quantity},</if>
<if test="item.quantityX != null">#{item.quantityX},</if>
<if test="item.quantityJ != null">#{item.quantityJ},</if>
<if test="item.price != null">#{item.price},</if>
<if test="item.cargoNo != null">#{item.cargoNo},</if>
<if test="item.remark != null">#{item.remark},</if>
<if test="item.assignNum != null">#{item.assignNum},</if>
<if test="item.assignNumX != null">#{item.assignNumX},</if>
<if test="item.assignNumJ != null">#{item.assignNumJ},</if>
<if test="item.printDate != null">#{item.printDate},</if>
<if test="item.stockStatus != null">#{item.stockStatus},</if>
<if test="item.supplierId != null">#{item.supplierId},</if>
<if test="item.customerId != null">#{item.customerId},</if>
<if test="item.unit != null">#{item.unit},</if>
<if test="item.spec != null">#{item.spec},</if>
<if test="item.spare1 != null">#{item.spare1},</if>
<if test="item.spare2 != null">#{item.spare2},</if>
<if test="item.spare3 != null">#{item.spare3},</if>
<if test="item.spare4 != null">#{item.spare4},</if>
<if test="item.spare5 != null">#{item.spare5},</if>
<if test="item.spare6 != null">#{item.spare6},</if>
</trim>
</foreach>
</insert>
<update id="updateInStockinDetail" parameterType="InStockinDetail">
update in_stockin_detail
@@ -174,9 +241,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteInStockinDetailByStockinDetailIds" parameterType="String">
delete from in_stockin_detail where stockin_detail_id in
delete from in_stockin_detail where stockin_detail_id in
<foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
#{stockinDetailId}
</foreach>
</delete>
</mapper>
</mapper>

14
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.receive.stockindetail.mapper.ReceiveStockinDetailMapper">
<resultMap type="ReceiveStockinDetail" id="ReceiveStockinDetailResult">
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockinGuid" column="stockin_guid" />
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinDetailList" parameterType="ReceiveStockinDetail" resultMap="ReceiveStockinDetailResult">
<include refid="selectReceiveStockinDetailVo"/>
<where>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where>
</select>
<select id="selectReceiveStockinDetailByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailResult">
<include refid="selectReceiveStockinDetailVo"/>
where stockin_detail_id = #{stockinDetailId}
@@ -135,6 +135,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare6 != null">#{spare6},</if>
</trim>
</insert>
<insert id="insertReceiveStockinDetailHistory">
insert into receive_stockin_detail_finish
select * from receive_stockin_detail where stockin_guid = #{receiveStockinGuid}
</insert>
<update id="updateReceiveStockinDetail" parameterType="ReceiveStockinDetail">
update receive_stockin_detail
@@ -174,9 +178,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteReceiveStockinDetailByStockinDetailIds" parameterType="String">
delete from receive_stockin_detail where stockin_detail_id in
delete from receive_stockin_detail where stockin_detail_id in
<foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
#{stockinDetailId}
</foreach>
</delete>
</mapper>
</mapper>

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

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.receive.stockin.mapper.ReceiveStockinMapper">
<resultMap type="ReceiveStockin" id="ReceiveStockinResult">
<result property="stockinGuid" column="stockin_guid" />
<result property="stockinId" column="stockin_id" />
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinList" parameterType="ReceiveStockin" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinVo"/>
<where>
<where>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
</where>
</select>
<select id="selectReceiveStockinByStockinGuid" parameterType="String" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinVo"/>
where stockin_guid = #{stockinGuid}
@@ -104,6 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="supplierNo != null">#{supplierNo},</if>
</trim>
</insert>
<insert id="insertReceiveStockinHistory">
insert into receive_stockin_finish
select * from receive_stockin where stockin_guid = #{stockinGuid}
</insert>
<update id="updateReceiveStockin" parameterType="ReceiveStockin">
update receive_stockin
@@ -135,9 +139,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteReceiveStockinByStockinGuids" parameterType="String">
delete from receive_stockin where stockin_guid in
delete from receive_stockin where stockin_guid in
<foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
#{stockinGuid}
</foreach>
</delete>
</mapper>
</mapper>