diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index b1738b324..8a53f6030 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -407,6 +407,7 @@ public class IoCollectOrderController extends BaseController { collectOrderService.finishOrder(collectOrderRequest, getUser(), false); return ResultVOUtils.success(); } + @PostMapping("/udiwms/basic/collect/order/finishCheckOrder") @Transactional(rollbackFor = Exception.class) public BaseResponse finishCheckOrder(@RequestBody CollectOrderRequest collectOrderRequest) { @@ -552,6 +553,7 @@ public class IoCollectOrderController extends BaseController { /** * 单据审核放弃订单 + * * @param collectOrderRequest * @return */ diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java index 46f5f9a18..bae847d93 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java @@ -306,9 +306,11 @@ public class IoCollectOrderBiz implements Serializable { @TableField(exist = false) private Integer addScanActCount; - @TableField(exist = false) private String queueCode; + private Integer ledNum; + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java index 22ea5f8a5..eeaf918b1 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java @@ -85,7 +85,8 @@ public class IoCollectLedGroupService extends ServiceImpl