Commit 0c867bd5995909070f03dad9bc655c634d07ae9b
1 parent
30af3d39
去除限制
Showing
1 changed file
with
5 additions
and
5 deletions
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
| ... | ... | @@ -333,8 +333,8 @@ public class RyTask extends BaseController { |
| 333 | 333 | .eq(ShipmentHeader::getShipmentType, "SCLLD") |
| 334 | 334 | .lt(ShipmentHeader::getMesErrorCount, 3) |
| 335 | 335 | .ne(ShipmentHeader::getMesSuccessStatus, 1) |
| 336 | - .gt(ShipmentHeader::getLastStatus, 500) | |
| 337 | - .gt(ShipmentHeader::getFirstStatus, 500)); | |
| 336 | + .gt(ShipmentHeader::getLastStatus, 499) | |
| 337 | + .gt(ShipmentHeader::getFirstStatus, 499)); | |
| 338 | 338 | //出库详情 |
| 339 | 339 | List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>() |
| 340 | 340 | .eq(ShipmentDetail::getShipmentId, shipmentHeader.getId())); |
| ... | ... | @@ -352,9 +352,9 @@ public class RyTask extends BaseController { |
| 352 | 352 | orderData.setOrderNo(shipmentDetailList.get(i).getOrderNo()); |
| 353 | 353 | Barcodedata barcodedata = new Barcodedata(); |
| 354 | 354 | barcodedata.setWeight(shipmentDetailList.get(i).getMaterialNetWeight()); |
| 355 | - if (StringUtils.isEmpty(shipmentDetailList.get(i).getBatteryPackTwoCode())) { | |
| 356 | - throw new ServiceException("电池编码为空"); | |
| 357 | - } | |
| 355 | +// if (StringUtils.isEmpty(shipmentDetailList.get(i).getBatteryPackTwoCode())) { | |
| 356 | +// throw new ServiceException("电池编码为空"); | |
| 357 | +// } | |
| 358 | 358 | barcodedata.setBatterybarcode(shipmentDetailList.get(i).getBatteryPackTwoCode()); |
| 359 | 359 | barcodedata.setElectricquantity(shipmentDetailList.get(i).getElectricQuantity()); |
| 360 | 360 | barcodedata.setMaterialBatch(shipmentDetailList.get(i).getMaterialBatch()); |
| ... | ... |