0311部分修改

src/main/java/com/sy/coinage/app/req/DeliveryWareConfirmReq.java

@@ -30,6 +30,6 @@ public class DeliveryWareConfirmReq implements Serializable {
     private List<@Valid SerialNumberVO> autoLs;
 
     @ApiModelProperty(value = "手动录入rfid集合")
-    private List<SerialNumberVO> manualLs;
+    private List<@Valid SerialNumberVO> manualLs;
 
 }

src/main/java/com/sy/coinage/workshop/controller/DeliveryController.java

@@ -74,6 +74,8 @@ public class DeliveryController extends BaseController {
         if (req.getDeliveryTime() != null && StringUtils.isNotBlank(String.valueOf(req.getDeliveryTime()))) {
             queryWrapper.between(Delivery::getDeliveryTime, DateUtils.getDayStartTime(req.getDeliveryTime()), DateUtils.getDayEndTime(req.getDeliveryTime()));
         }
+        queryWrapper.gt(Delivery::getId, 0);
+        queryWrapper.orderByDesc(Delivery::getId);
         Page<Delivery> page = new Page<>(req.getPage(), req.getRows());
         IPage<Delivery> data = this.deliveryService.page(page, queryWrapper);
         return data;

src/main/java/com/sy/coinage/workshop/service/impl/DeliveryServiceImpl.java

@@ -93,7 +93,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryDao, Delivery> impl
         }
         if (req.getManualLs() != null && req.getManualLs().size() > 0) {
             for (SerialNumberVO vo : req.getManualLs()) {
-                DeliveryDetail detail = this.baseDeliveryDetail(product, vo.getSerialNumber(), null, model, date, 2);
+                DeliveryDetail detail = this.baseDeliveryDetail(product, vo.getSerialNumber(), vo.getRfid(), model, date, 2);
                 list.add(detail);
             }
         }