root/wq-wms-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add：出库明细页面

Browse Source
This commit is contained in:
zhaoyf
2026-08-10 18:35:09 +08:00
parent 2a21ac2e7f
commit 4b148da64a
7 changed files with 168 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/controller/OutBillController.java
View File

@@ -74,6 +74,12 @@ public class OutBillController {
return ResponseData.build(iOutBillService.getOutBillDtl(whereJson), HttpStatus.OK);
}
@GetMapping("/details")
@Log("分页查询出库单明细")
public ResponseEntity<Object> queryDtl(@RequestParam Map whereJson, PageQuery page) {
return ResponseData.build(iOutBillService.pageQueryDtl(whereJson, page), HttpStatus.OK);
}
@GetMapping("/getOutBillDis")
@Log("查询未出库单分配")
public ResponseEntity<Object> getOutBillDis(@RequestParam Map whereJson) {

2
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/IOutBillService.java
View File

@@ -80,6 +80,8 @@ public interface IOutBillService extends IService<IOStorInv> {
*/
List<IOStorInvDtlDto> getOutBillDtl(Map whereJson);
IPage<IOStorInvDtlDto> pageQueryDtl(Map whereJson, PageQuery page);
/**
* 查询未出库分配
* @param whereJson

2
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.java
View File

@@ -24,6 +24,8 @@ public interface IOStorInvMapper extends BaseMapper<IOStorInv> {
List<IOStorInvDtlDto> getIODtl (@Param("params") Map whereJson);
IPage<IOStorInvDtlDto> queryOutBillDtlPage(IPage<IOStorInvDtlDto> page, @Param("params") Map whereJson);
IPage<IOStorInv> queryOutBillPage (IPage<IOStorInv> page,@Param("params") Map whereJson);
}

41
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml
View File

@@ -185,4 +185,45 @@
</where>
ORDER BY ios.iostorinv_id Desc
</select>
<select id="queryOutBillDtlPage" resultType="org.nl.wms.warehouse_manage.inAndOut.service.dto.IOStorInvDtlDto">
SELECT
dtl.*,
ios.bill_code,
ios.bill_status AS mst_bill_status,
ios.stor_id,
ios.stor_name,
ios.bill_type,
ios.biz_date,
mb.material_code,
mb.material_name
FROM st_ivt_iostorinvdtl dtl
INNER JOIN st_ivt_iostorinv ios ON ios.iostorinv_id = dtl.iostorinv_id
LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
<where>
ios.is_delete = '0' AND ios.io_type = '1'
<if test="params.bill_code != null and params.bill_code != ''">
AND ios.bill_code LIKE CONCAT('%', #{params.bill_code}, '%')
</if>
<if test="params.material_code != null and params.material_code != ''">
AND mb.material_code LIKE CONCAT('%', #{params.material_code}, '%')
</if>
<if test="params.material_name != null and params.material_name != ''">
AND mb.material_name LIKE CONCAT('%', #{params.material_name}, '%')
</if>
<if test="params.pcsn != null and params.pcsn != ''">
AND dtl.pcsn LIKE CONCAT('%', #{params.pcsn}, '%')
</if>
<if test="params.stor_id != null and params.stor_id != ''">
AND ios.stor_id = #{params.stor_id}
</if>
<if test="params.bill_status != null and params.bill_status != ''">
AND ios.bill_status = #{params.bill_status}
</if>
<if test="params.bill_type != null and params.bill_type != ''">
AND ios.bill_type = #{params.bill_type}
</if>
</where>
ORDER BY ios.input_time DESC, dtl.seq_no ASC
</select>
</mapper>

10
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dto/IOStorInvDtlDto.java
View File

@@ -25,6 +25,16 @@ public class IOStorInvDtlDto extends IOStorInvDtl {
*/
private String bill_code;
private String mst_bill_status;
private String stor_id;
private String stor_name;
private String bill_type;
private String biz_date;
/**
* 载具编号
*/

6
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java
View File

@@ -149,6 +149,12 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
public List<IOStorInvDtlDto> getOutBillDtl(Map whereJson) {
return ioStorInvMapper.getIODtl(whereJson);
}
@Override
public IPage<IOStorInvDtlDto> pageQueryDtl(Map whereJson, PageQuery page) {
return ioStorInvMapper.queryOutBillDtlPage(new Page<>(page.getPage() + 1, page.getSize()), whereJson);
}
@Override
public List<IOStorInvDisDto> getOutBillDis(Map whereJson) {
return ioStorInvDisMapper.queryOutBillDisDtl(whereJson);