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

盘点出库、入库页面显示

Browse Source
This commit is contained in:
liuhanqing
2025-10-23 10:21:34 +08:00
parent 2eba2fec89
commit 14b2b615ec
12 changed files with 101 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,7 +201,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
//货位盘点
for (int i = 0; i < detailList.size(); i++) {
BasStock param = new BasStock();
param.setCargoSpaceId(detailList.get(i).getSpare1());
param.setCargoSpaceId(detailList.get(i).getCargoSpaceId());
List<BasStock> basStocks = basStockService.selectBasStockList(param);
Integer quantity = 0;
for (BasStock basStock : basStocks) {

1
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java
View File

@@ -169,4 +169,5 @@ public class CheckStockinDetail extends BaseEntity
private String supplierName;
}

12
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -538,10 +538,20 @@ public class MydoJobServiceImpl implements IMydoJobService {
BigDecimal subtract = stockInNum.subtract(jobOutNum);
checkStockinDetail.setScanNum(Convert.toStr(subtract));
checkStockinDetailService.updateCheckStockinDetail(checkStockinDetail);
String stockId = mydoJobDetail.getStockId();
BasStock basStock = basStockService.selectBasStockByStockId(stockId);
if (basStock != null) {
BigDecimal outQuantity = Convert.toBigDecimal(basStock.getOutQuantity());
BigDecimal substract = outQuantity.subtract(Convert.toBigDecimal(mydoJobDetail.getOutQuantity()));
basStock.setOutQuantity(String.valueOf(substract));
basStockService.updateBasStock(basStock);
}
}
//修改货位状态
BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId());
basCargoSpace.setStatus("1");
basCargoSpace.setStatus("2");
basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
mydoJob.setStatus("5");

1
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java
View File

@@ -151,6 +151,7 @@ public class MydoJobDetail extends BaseEntity
@Excel(name = "机型")
private String unit;
private String trayCode;
private String cargoNo;

5
ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml
View File

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="cargoSpaceId" column="cargo_space_id" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="orderId" column="order_id" />
<result property="supplierName" column="supplier_name" />
</resultMap>
<sql id="selectCheckStockinDetailVo">
@@ -60,7 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.unit ,
bp.cargo_no,
bp.spec,
bs.supplier_name
bs.supplier_name,
csd.cargo_space_id
from check_stockin_detail csd
left join bas_product bp on csd.product_id = bp.product_id
left join bas_cargo_space bcs on csd.cargo_space_id = bcs.cargo_space_id

6
ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml
View File

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare9" column="spare9" />
<result property="spec" column="spec" />
<result property="unit" column="unit" />
<result property="cargoNo" column="cargo_no" />
<result property="productName" column="product_name" />
<result property="supplierName" column="supplier_name" />
@@ -147,8 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mjd.spare7,
mjd.spare8,
mjd.spare9,
mjd.spec,
mjd.unit,
bp.spec,
bp.unit,
bp.cargo_no,
bs.supplier_name
from mydo_job_detail_finish mjd
left join bas_product bp on mjd.product_id = bp.product_id

6
ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
View File

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="giveNum" column="give_num" />
<result property="stockinId" column="stockin_id" />
<result property="stackingId" column="stacking_id" />
<result property="cargoNo" column="cargo_no" />
<result property="exitId" column="exit_id" />
<result property="printDate" column="print_date" />
<result property="customerId" column="customer_id" />
@@ -80,8 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mjd.spare7,
mjd.spare8,
mjd.spare9,
mjd.spec,
mjd.unit,
bp.spec,
bp.unit,
bp.cargo_no,
bs.supplier_name
from mydo_job_detail mjd