rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	nflg-wms-admin/src/main/resources/template/生产退料单.html
This commit is contained in:
曹鹏飞 2026-03-31 13:46:25 +08:00
parent 6c1cdb8d0e 3d8352cb63
commit 5f0f7f616f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
View File

@ -124,7 +124,8 @@ public class OutPurchaseController extends BaseController {
.setWerks(it.getFactoryCode()) .setWerks(it.getFactoryCode())
.setMeins(it.getUnit()) .setMeins(it.getUnit())
.setLgort(it.getStorageLocation()) .setLgort(it.getStorageLocation())
.setEbelp(it.getPoLineNumberNew().toString()) // .setEbelp(it.getPoLineNumberNew().toString())
.setEbelp(Optional.ofNullable(it.getPoLineNumberNew()).map(Object::toString).orElse(""))
) )
.toList() .toList()
); );