新增record_type字段区分扫码枪录入还是采购录入明细表,以及注释扫码枪代码,修改出入库移库逻辑
This commit is contained in:
@@ -66,5 +66,9 @@ public class WmsStockIoDetail extends BaseEntity {
|
||||
* 源库位ID(移库时使用)
|
||||
*/
|
||||
private Long fromWarehouseId;
|
||||
/**
|
||||
* 记录类型,0:详情,1:扫码枪记录
|
||||
*/
|
||||
private Integer recordType;
|
||||
|
||||
}
|
||||
|
||||
@@ -77,5 +77,10 @@ public class WmsStockIoDetailBo extends BaseEntity {
|
||||
*/
|
||||
private Long fromWarehouseId;
|
||||
|
||||
/**
|
||||
* 记录类型,0:详情,1:扫码枪记录
|
||||
*/
|
||||
private Integer recordType;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -75,6 +75,11 @@ public class WmsStockIoDetailVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 记录类型,0:详情,1:扫码枪记录
|
||||
*/
|
||||
private Integer recordType;
|
||||
|
||||
/**
|
||||
* 库区/库位名称
|
||||
*/
|
||||
|
||||
@@ -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)) {
|
||||
// 入库:目标库位库存增加
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user