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-30 16:42:43 +08:00
parent ace9f89b3f
commit 1804b7c34b
8 changed files with 113 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.check.difference.domain;
import com.ruoyi.common.domain.ExtraField;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -33,6 +34,8 @@ public class CheckDifferenceRecord extends BaseEntity
/** 货位id */
@Excel(name = "货位id")
private String cargoSpaceId;
@Excel(name = "货位")
private String cargoSpaceName;
/** 物料id */
@Excel(name = "物料id")
@@ -77,6 +80,21 @@ public class CheckDifferenceRecord extends BaseEntity
@Excel(name = "仓库名称")
private String warehouseName;
private ExtraField extraField;
public String getCargoSpaceName() {
return cargoSpaceName;
}
public void setCargoSpaceName(String cargoSpaceName) {
this.cargoSpaceName = cargoSpaceName;
}
public ExtraField getExtraField() {
return extraField;
}
public void setExtraField(ExtraField extraField) {
this.extraField = extraField;
}
public String getWarehouseId() {
return warehouseId;

18
ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java
View File

@@ -74,7 +74,11 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
}
basStock.setProductStatus("2");
basStockService.updateBasStock(basStock);
checkDifferenceRecord.setCargoSpaceId(basStock.getCargoSpaceId());
checkDifferenceRecord.setOldQuantity(basStock.getQuantity());
checkDifferenceRecord.setTrayCode(basStock.getTrayCode());
checkDifferenceRecord.setProductId(basStock.getProductId());
checkDifferenceRecord.setWarehouseId(basStock.getWarehouseId());
}else if (checkDifferenceRecord.getRecordType()==2){
//判断该物料是否已经存在
BasStock queryStock = new BasStock();
@@ -100,6 +104,11 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
basStock.setProductStatus("2");
basStockService.updateBasStock(basStock);
checkDifferenceRecord.setNewQuantity("0");
checkDifferenceRecord.setCargoSpaceId(basStock.getCargoSpaceId());
checkDifferenceRecord.setTrayCode(basStock.getTrayCode());
checkDifferenceRecord.setProductId(basStock.getProductId());
checkDifferenceRecord.setWarehouseId(basStock.getWarehouseId());
checkDifferenceRecord.setOldQuantity(basStock.getQuantity());
}
checkDifferenceRecord.setCreateTime(new Date());
checkDifferenceRecord.setCheckGuid(IdUtil.fastSimpleUUID());
@@ -129,6 +138,15 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
@Override
public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids)
{
for (String checkGuid : checkGuids) {
CheckDifferenceRecord checkDifferenceRecord = checkDifferenceRecordMapper.selectCheckDifferenceRecordByCheckGuid(checkGuid);
if (checkDifferenceRecord.getRecordType() == 3 || checkDifferenceRecord.getRecordType() == 1){
//如果是删除和修改的数据，则需要更新库存状态
BasStock basStock = basStockService.selectBasStockByStockId(checkDifferenceRecord.getStockId());
basStock.setProductStatus("1");
basStockService.updateBasStock(basStock);
}
}
return checkDifferenceRecordMapper.deleteCheckDifferenceRecordByCheckGuids(checkGuids);
}

21
ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
View File

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="stockId" column="stock_id" />
<result property="trayCode" column="tray_code" />
<result property="cargoSpaceId" column="cargo_space_id" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="productId" column="product_id" />
<result property="lotNo" column="lot_no" />
<result property="supplier" column="supplier" />
@@ -22,15 +23,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="status" column="status" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</resultMap>
<sql id="selectCheckDifferenceRecordVo">
select r.check_guid, r.check_stock_detail_id, r.stock_id, r.tray_code, r.cargo_space_id,
r.product_id, r.lot_no, r.supplier, r.customer, r.old_quantity, r.new_quantity,
select r.check_guid, r.check_stock_detail_id, r.stock_id, r.tray_code, r.cargo_space_id,
r.product_id, r.lot_no, r.supplier, r.customer, r.old_quantity, r.new_quantity,
r.record_type, r.create_time, r.product_guid, r.status, r.warehouse_id,
w.warehouse_name
w.warehouse_name,bp.product_name,bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,
bcs.cargo_space_name
from check_difference_record r
left join bas_warehouse w on r.warehouse_id = w.warehouse_id
left join bas_product bp on r.product_id = bp.product_id
left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id
</sql>
<select id="selectCheckDifferenceRecordList" parameterType="CheckDifferenceRecord" resultMap="CheckDifferenceRecordResult">

1
ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
View File

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="cargoSpaceStockStatus" column="cargoSpaceStockStatus" />
<result property="warehouseName" column="warehouse_name" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="productId" column="product_id" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />