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

197
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java
View File

@@ -1,5 +1,8 @@
package com.ruoyi.check.stockcheck.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -7,10 +10,13 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 盘库单据主信息对象 check_stockin
*
*
* @author ruoyi
* @date 2025-05-29
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CheckStockin extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -41,6 +47,7 @@ public class CheckStockin extends BaseEntity
/** 仓库ID */
@Excel(name = "仓库ID")
private String warehouseId;
private String warehouseName;
/** 完成日期 */
@Excel(name = " 完成日期")
@@ -90,195 +97,7 @@ public class CheckStockin extends BaseEntity
@Excel(name = "备用字段5")
private String spare5;
public void setStockGuid(String stockGuid)
{
this.stockGuid = stockGuid;
}
public String getStockGuid()
{
return stockGuid;
}
public void setStockCheckId(String stockCheckId)
{
this.stockCheckId = stockCheckId;
}
public String getStockCheckId()
{
return stockCheckId;
}
public void setCheckType(String checkType)
{
this.checkType = checkType;
}
public String getCheckType()
{
return checkType;
}
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 setFinishDate(String finishDate)
{
this.finishDate = finishDate;
}
public String getFinishDate()
{
return finishDate;
}
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;
}
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;
}
@Override
public String toString() {

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());

6
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java
View File

@@ -45,11 +45,7 @@ public class CheckStockinDetailServiceImpl implements ICheckStockinDetailService
@Override
public List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail)
{
List<CheckStockinDetail> checkStockinDetails = checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail);
for (CheckStockinDetail stockinDetail : checkStockinDetails) {
stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class));
}
return checkStockinDetails;
return checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail);
}
/**

6
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java
View File

@@ -97,10 +97,6 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
@Override
public List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) {
List<CheckStockinDetail> checkStockinDetails = checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail);
for (CheckStockinDetail stockinDetail : checkStockinDetails) {
stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class));
}
return checkStockinDetails;
return checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail);
}
}

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

@@ -116,6 +116,7 @@ public class InStockinServiceImpl implements IInStockinService
* @param inStockin
*/
private void insertInStockinHistory(InStockin inStockin) {
inStockin = selectInStockinByStockinGuid(inStockin.getStockinGuid());
//插入历史单据
inStockinMapper.insertInStockinHistory(inStockin);
iInStockinDetailService.insertInStockinDetailHistory(inStockin);

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

@@ -46,11 +46,10 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
@Override
public List<InStockinDetail> selectInStockinDetailList(InStockinDetail inStockinDetail)
{
List<InStockinDetail> inStockinDetails = inStockinDetailMapper.selectInStockinDetailList(inStockinDetail);
for (InStockinDetail res : inStockinDetails) {
/*for (InStockinDetail res : inStockinDetails) {
res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class));
}
return inStockinDetails;
}*/
return inStockinDetailMapper.selectInStockinDetailList(inStockinDetail);
}
/**

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

@@ -97,11 +97,8 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
@Override
public List<InStockinDetail> selectInStockinDetailList(InStockinDetail inStockinDetail) {
List<InStockinDetail> inStockinDetails = inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail);
for (InStockinDetail res : inStockinDetails) {
res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class));
}
return inStockinDetails;
return inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail);
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java
View File

@@ -46,11 +46,11 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
public List<MydoJobDetail> selectMydoJobDetailList(MydoJobDetail mydoJobDetail)
{
List<MydoJobDetail> mydoJobDetails = mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail);
for (MydoJobDetail jobDetail : mydoJobDetails) {
/*for (MydoJobDetail jobDetail : mydoJobDetails) {
if (StrUtil.isNotEmpty(jobDetail.getSpare1())){
jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class));
}
}
}*/
return mydoJobDetails;
}

4
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java
View File

@@ -54,11 +54,11 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi
String jobId = mydoJobDetail.getJobId();
List<MydoJobDetail> mydoJobDetails = mydoJobDetailFinishMapper.selectMydoJobDetailFinishListByJobId(jobId);
for (MydoJobDetail jobDetail : mydoJobDetails) {
/*for (MydoJobDetail jobDetail : mydoJobDetails) {
if (StrUtil.isNotEmpty(jobDetail.getSpare1())){
jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class));
}
}
}*/
return mydoJobDetails;
}

35
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 可出库的库存物资信息对象 view_product_and_stock
*
*
* @author ruoyi
* @date 2025-05-21
*/
@@ -38,63 +38,72 @@ public class ViewProductAndStock extends BaseEntity
/** 仓库 */
@Excel(name = "仓库")
private String warehouseId;
private String warehouseName;
public void setOnlyIdentity(Long onlyIdentity)
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public void setOnlyIdentity(Long onlyIdentity)
{
this.onlyIdentity = onlyIdentity;
}
public Long getOnlyIdentity()
public Long getOnlyIdentity()
{
return onlyIdentity;
}
public void setProductId(String productId)
public void setProductId(String productId)
{
this.productId = productId;
}
public String getProductId()
public String getProductId()
{
return productId;
}
public void setLotNo(String lotNo)
public void setLotNo(String lotNo)
{
this.lotNo = lotNo;
}
public String getLotNo()
public String getLotNo()
{
return lotNo;
}
public void setProductName(String productName)
public void setProductName(String productName)
{
this.productName = productName;
}
public String getProductName()
public String getProductName()
{
return productName;
}
public void setQuantity(String quantity)
public void setQuantity(String quantity)
{
this.quantity = quantity;
}
public String getQuantity()
public String getQuantity()
{
return quantity;
}
public void setWarehouseId(String warehouseId)
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId()
public String getWarehouseId()
{
return warehouseId;
}

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

@@ -48,11 +48,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
@Override
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail)
{
List<ReceiveStockinDetail> receiveStockinDetails = receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail);
for (ReceiveStockinDetail stockinDetail : receiveStockinDetails) {
stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class));
}
return receiveStockinDetails;
return receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail);
}
/**

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

@@ -98,10 +98,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
@Override
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) {
List<ReceiveStockinDetail> receiveStockinDetails = receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail);
for (ReceiveStockinDetail res : receiveStockinDetails) {
res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class));
}
return receiveStockinDetails;
return receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail);
}
}