新增record_type字段区分扫码枪录入还是采购录入明细表,以及注释扫码枪代码,修改出入库移库逻辑

This commit is contained in:
2025-07-23 16:04:23 +08:00
parent 4422ca9099
commit 7db38923c9
10 changed files with 619 additions and 595 deletions

View File

@@ -66,5 +66,9 @@ public class WmsStockIoDetail extends BaseEntity {
* 源库位ID移库时使用
*/
private Long fromWarehouseId;
/**
* 记录类型0详情1扫码枪记录
*/
private Integer recordType;
}

View File

@@ -77,5 +77,10 @@ public class WmsStockIoDetailBo extends BaseEntity {
*/
private Long fromWarehouseId;
/**
* 记录类型0详情1扫码枪记录
*/
private Integer recordType;
}

View File

@@ -75,6 +75,11 @@ public class WmsStockIoDetailVo {
@ExcelProperty(value = "备注")
private String remark;
/**
* 记录类型0详情1扫码枪记录
*/
private Integer recordType;
/**
* 库区/库位名称
*/

View File

@@ -162,6 +162,10 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService {
throw new RuntimeException("单据明细不能为空");
}
for (WmsStockIoDetail detail : details) {
// 新增扫码枪录入recordType==1时不做任何库存操作
if (detail.getRecordType() != null && detail.getRecordType() == 1) {
continue;
}
String ioType = stockIo.getIoType();
if ("in".equals(ioType)) {
// 入库:目标库位库存增加

View File

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="fromWarehouseId" column="from_warehouse_id"/>
<result property="recordType" column="record_type"/>
</resultMap>
<!-- 联查库区/库位名称的明细列表SQL直接返回Map -->
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.update_time,
d.update_by,
d.from_warehouse_id,
d.record_type,
w1.warehouse_name AS warehouseName,
w2.warehouse_name AS fromWarehouseName
FROM wms_stock_io_detail d
@@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.update_time,
d.update_by,
d.from_warehouse_id,
d.record_type,
w1.warehouse_name AS warehouseName,
w2.warehouse_name AS fromWarehouseName
FROM wms_stock_io_detail d