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

Merge branch 'master' into develop

This commit is contained in:
曹鹏飞 2026-06-12 18:50:32 +08:00
parent de929bf9f4 4eaf89dd3c
commit 2d9718c249
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java
View File

@ -297,8 +297,8 @@ public class PackingController extends BaseController {
WmsSrmOrderItem item = srmOrderItemService.lambdaQuery() WmsSrmOrderItem item = srmOrderItemService.lambdaQuery()
.eq(WmsSrmOrderItem::getNoteNum, request.getDeliveryNo()) .eq(WmsSrmOrderItem::getNoteNum, request.getDeliveryNo())
.eq(WmsSrmOrderItem::getItemCode, materialCode) .eq(WmsSrmOrderItem::getItemCode, materialCode)
// .eq(WmsSrmOrderItem::getPoNum, qrCodeMaster.getPoNumber()) .eq(WmsSrmOrderItem::getPoNum, qrCodeMaster.getPoNumber())
// .eq(WmsSrmOrderItem::getPoLineNumber, qrCodeMaster.getPoLineNumber()) .eq(WmsSrmOrderItem::getPoLineNumber, qrCodeMaster.getPoLineNumber())
.one(); .one();
//和送货单进行验证 //和送货单进行验证
srmOrderValidation(item, quantity); srmOrderValidation(item, quantity);

6
nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
View File

@ -203,9 +203,9 @@
when c.packaging_type = 0 then c.delivery_line_no when c.packaging_type = 0 then c.delivery_line_no
else d.delivery_line_no end as delivery_line_no, else d.delivery_line_no end as delivery_line_no,
case when c.packaging_type = 0 then c.delivery_no else d.delivery_no end as delivery_no, case when c.packaging_type = 0 then c.delivery_no else d.delivery_no end as delivery_no,
case sum( case
when c.packaging_type = 0 then c.quantity when c.packaging_type = 0 then c.quantity
else sum(d.quantity) end as packing_quantity else d.quantity end) as packing_quantity
from wms_package a from wms_package a
inner join wms_package_item b on a.id = b.package_id inner join wms_package_item b on a.id = b.package_id
left join wms_qr_code_master c on b.barcode_code = c.barcode_code left join wms_qr_code_master c on b.barcode_code = c.barcode_code