From 0c867bd5995909070f03dad9bc655c634d07ae9b Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Tue, 24 May 2022 08:58:31 +0800
Subject: [PATCH] 去除限制
---
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java b/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
index cdc5b1e..963a1ef 100644
--- a/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
+++ b/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
@@ -333,8 +333,8 @@ public class RyTask extends BaseController {
.eq(ShipmentHeader::getShipmentType, "SCLLD")
.lt(ShipmentHeader::getMesErrorCount, 3)
.ne(ShipmentHeader::getMesSuccessStatus, 1)
- .gt(ShipmentHeader::getLastStatus, 500)
- .gt(ShipmentHeader::getFirstStatus, 500));
+ .gt(ShipmentHeader::getLastStatus, 499)
+ .gt(ShipmentHeader::getFirstStatus, 499));
//出库详情
List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>()
.eq(ShipmentDetail::getShipmentId, shipmentHeader.getId()));
@@ -352,9 +352,9 @@ public class RyTask extends BaseController {
orderData.setOrderNo(shipmentDetailList.get(i).getOrderNo());
Barcodedata barcodedata = new Barcodedata();
barcodedata.setWeight(shipmentDetailList.get(i).getMaterialNetWeight());
- if (StringUtils.isEmpty(shipmentDetailList.get(i).getBatteryPackTwoCode())) {
- throw new ServiceException("电池编码为空");
- }
+// if (StringUtils.isEmpty(shipmentDetailList.get(i).getBatteryPackTwoCode())) {
+// throw new ServiceException("电池编码为空");
+// }
barcodedata.setBatterybarcode(shipmentDetailList.get(i).getBatteryPackTwoCode());
barcodedata.setElectricquantity(shipmentDetailList.get(i).getElectricQuantity());
barcodedata.setMaterialBatch(shipmentDetailList.get(i).getMaterialBatch());
--
libgit2 0.22.2