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

fix(controller): 修复多个控制器中订单ID查询参数错误 

- 修正 ComponentOutboundController 中 packingId 查询条件使用 order.getId()
- 修正 InCostCenterBackController 中 orderId 查询条件使用 order.getId()
- 修正 InProduceBackController 中 orderId 查询条件使用 order.getId()
- 修正 InProduceOrderController 中 orderId 查询条件使用 order.getId()
- 修正 InProduceOrderSurplusController 支持按 ID 或编号查询并修正查询条件
- 修正 NormalPGIController 中多个查询使用正确的 order.getId() 参数
- 修正 OutAssistanceController 中 orderId 查询条件使用 order.getId()
- 修正 OutCostCenterController 中 orderId 查询条件使用 order.getId()
- 修正 OutProduceController 中 orderId 查询条件使用 order.getId()
- 修正 OutPurchaseController 中 applicationId 查询条件使用 order.getId()
- 修正 TransferCompanyController 多处查询使用正确的 order.getId() 参数
- 修正 TransferFactoryController 中查询条件使用 order.getId() 参数
This commit is contained in:
曹鹏飞 2026-06-03 15:42:45 +08:00
parent 487563add8
commit afbf2f7582
12 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java
View File

@ -418,7 +418,7 @@ public class ComponentOutboundController extends BaseController {
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsComponentPackingItem> items = wmsComponentPackingItemService.lambdaQuery()
.eq(WmsComponentPackingItem::getPackingId, orderId)
.eq(WmsComponentPackingItem::getPackingId, order.getId())
.list();
items.removeIf(item -> item.getOutQty().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getIdnrk()));

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
View File

@ -217,7 +217,7 @@ public class InCostCenterBackController extends BaseController {
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsInCostcenterBackItem> items = inCostcenterBackItemService.lambdaQuery()
.eq(WmsInCostcenterBackItem::getOrderId, orderId)
.eq(WmsInCostcenterBackItem::getOrderId, order.getId())
.list();
items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
View File

@ -226,7 +226,7 @@ public class InProduceBackController extends BaseController {
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsInProduceBackItem> items = inProduceBackItemService.lambdaQuery()
.eq(WmsInProduceBackItem::getOrderId, orderId)
.eq(WmsInProduceBackItem::getOrderId, order.getId())
.list();
items.removeIf(item -> item.getSqsl().subtract(item.getNum()).compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
View File

@ -432,7 +432,7 @@ public class InProduceOrderController extends BaseController {
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsInProduceOrderItem> items = produceOrderItemService.lambdaQuery()
.eq(WmsInProduceOrderItem::getOrderId, orderId)
.eq(WmsInProduceOrderItem::getOrderId, order.getId())
.list();
items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMaterialNo()));

15
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java
View File

@ -403,11 +403,15 @@ public class InProduceOrderSurplusController extends BaseController {
* @param orderId 订单ID
*/
@GetMapping("getListForNoScan")
public ApiResult<List<NoScanItemVO>> getListForNoScan(@RequestParam Long orderId) {
WmsInProduceOrderSurplus order = inProduceOrderSurplusService.getById(orderId);
public ApiResult<List<NoScanItemVO>> getListForNoScan(@RequestParam(required = false) Long orderId
, @RequestParam(required = false) String no) {
WmsInProduceOrderSurplus order = inProduceOrderSurplusService.lambdaQuery()
.eq(Objects.nonNull(orderId), WmsInProduceOrderSurplus::getId, orderId)
.eq(StrUtil.isNotBlank(no), WmsInProduceOrderSurplus::getNo, no)
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsInProduceOrderSurplusItem> items = inProduceOrderSurplusItemService.lambdaQuery()
.eq(WmsInProduceOrderSurplusItem::getOrderId, orderId)
.eq(WmsInProduceOrderSurplusItem::getOrderId, order.getId())
.list();
items.removeIf(item -> item.getLeftNum().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));
@ -444,7 +448,10 @@ public class InProduceOrderSurplusController extends BaseController {
WmsInProduceOrderSurplus order = null;
for (NoScanningRequest request : requests) {
order = inProduceOrderSurplusService.getById(request.getId());
order = inProduceOrderSurplusService.lambdaQuery()
.eq(Objects.nonNull(request.getId()), WmsInProduceOrderSurplus::getId, request.getId())
.eq(StrUtil.isNotBlank(request.getNo()), WmsInProduceOrderSurplus::getNo, request.getNo())
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
WmsInProduceOrderSurplus currentOrder = order;
List<WmsInProduceOrderSurplusItem> orderItems = inProduceOrderSurplusItemService.lambdaQuery()

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

@ -201,7 +201,7 @@ public class NormalPGIController extends BaseController {
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("收货单不存在");
List<WmsSrmOrderItem> items = wmsSrmOrderItemService.lambdaQuery()
.eq(WmsSrmOrderItem::getOrderId, orderId)
.eq(WmsSrmOrderItem::getOrderId, order.getId())
.list();
items.removeIf(item -> item.getDeliveryQty().compareTo(item.getReceiptQty()) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getItemCode()));
@ -268,7 +268,7 @@ public class NormalPGIController extends BaseController {
// 查询当前订单的所有明细项，建立索引
Map<Long, WmsSrmOrderItem> orderItemMap = wmsSrmOrderItemService.lambdaQuery()
.eq(WmsSrmOrderItem::getOrderId, request.getId())
.eq(WmsSrmOrderItem::getOrderId, order.getId())
.list()
.stream()
.collect(Collectors.toMap(WmsSrmOrderItem::getId, i -> i));

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
View File

@ -295,7 +295,7 @@ public class OutAssistanceController extends BaseController {
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsOutAssistanceItem> items = outAssistanceItemService.lambdaQuery()
.eq(WmsOutAssistanceItem::getOrderId, orderId)
.eq(WmsOutAssistanceItem::getOrderId, order.getId())
.list();
items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr1()));

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -296,7 +296,7 @@ public class OutCostCenterController extends BaseController {
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsOutCostcenterItem> items = outCostcenterItemService.lambdaQuery()
.eq(WmsOutCostcenterItem::getOrderId, orderId)
.eq(WmsOutCostcenterItem::getOrderId, order.getId())
.list();
items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -423,7 +423,7 @@ public class OutProduceController extends BaseController {
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsOutProduceItem> items = outProduceItemService.lambdaQuery()
.eq(WmsOutProduceItem::getOrderId, orderId)
.eq(WmsOutProduceItem::getOrderId, order.getId())
.list();
items.removeIf(item -> item.getSqsl().subtract(item.getNum()).compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));

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

@ -154,7 +154,7 @@ public class OutPurchaseController extends BaseController {
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsReturnRequestItem> items = returnRequestItemService.lambdaQuery()
.eq(WmsReturnRequestItem::getApplicationId, orderId)
.eq(WmsReturnRequestItem::getApplicationId, order.getId())
.list();
items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMaterialCode()));

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

@ -504,7 +504,7 @@ public class TransferCompanyController extends BaseController {
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsTransferCompanyItem> items = transferCompanyItemService.lambdaQuery()
.eq(WmsTransferCompanyItem::getOrderId, orderId)
.eq(WmsTransferCompanyItem::getOrderId, order.getId())
.list();
items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));
@ -968,7 +968,7 @@ public class TransferCompanyController extends BaseController {
.eq(StrUtil.isNotBlank(no), WmsTransferCompanyTicket::getNo, no)
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(orderId);
List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(order.getId());
items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));
return ApiResult.success(

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
View File

@ -938,7 +938,7 @@ public class TransferFactoryController extends BaseController {
, @RequestParam(required = false) String no) {
TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(orderId, no);
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<TransferFactoryItemVO> items = transferFactoryTicketItemService.getList(orderId);
List<TransferFactoryItemVO> items = transferFactoryTicketItemService.getList(order.getId());
items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));
return ApiResult.success(