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-06-10 10:50:24 +08:00
parent be72a0ac13
commit a87bc77cf3
30 changed files with 561 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
View File

@@ -6,6 +6,7 @@ import java.util.Date;
import java.util.List;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil;
import com.ruoyi.bas.BasProduct.domain.BasProduct;
import com.ruoyi.bas.BasProduct.service.IBasProductService;
@@ -14,6 +15,7 @@ import com.ruoyi.check.stockcheck.domain.CheckStockVo;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import com.ruoyi.check.stockcheckdetail.service.ICheckStockinDetailService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
@@ -127,6 +129,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
}
private void insertCheckStockinHistory(CheckStockin checkStockin) {
checkStockin = selectCheckStockinByStockGuid(checkStockin.getStockGuid());
//插入历史单据
checkStockinMapper.insertCheckStockinHistory(checkStockin);
checkStockinDetailService.insertCheckStockinDetailHistory(checkStockin);
@@ -163,12 +166,12 @@ public class CheckStockinServiceImpl implements ICheckStockinService
public String saveBill(CheckStockVo checkStockVo) {
CheckStockin checkStockin = checkStockVo.getCheckStockin();
List<CheckStockinDetail> detailList = checkStockVo.getDetailList();
String stockCheckId = basJobIdService.getJobId("CKD");
String stockCheckId = basJobIdService.getJobId("PDD");
checkStockin.setStockCheckId(stockCheckId);
checkStockin.setStockGuid(IdUtil.simpleUUID());
checkStockin.setCreateDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
String username = SecurityContextHolder.getContext().getAuthentication().getName();
checkStockin.setCreateManId(username);
checkStockin.setCreateManId(SecurityUtils.getUsername());
checkStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
checkStockin.setStatus("1");
checkStockin.setStockSource("0");
checkStockin.setCheckType(checkStockin.getCheckType());