取药确认

dev_unify
yewj 6 months ago
parent 73f8be2082
commit 7b053a694b

@ -407,6 +407,7 @@ public class IoCollectOrderController extends BaseController {
collectOrderService.finishOrder(collectOrderRequest, getUser(), false); collectOrderService.finishOrder(collectOrderRequest, getUser(), false);
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@PostMapping("/udiwms/basic/collect/order/finishCheckOrder") @PostMapping("/udiwms/basic/collect/order/finishCheckOrder")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public BaseResponse finishCheckOrder(@RequestBody CollectOrderRequest collectOrderRequest) { public BaseResponse finishCheckOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
@ -552,6 +553,7 @@ public class IoCollectOrderController extends BaseController {
/** /**
* *
*
* @param collectOrderRequest * @param collectOrderRequest
* @return * @return
*/ */

@ -306,9 +306,11 @@ public class IoCollectOrderBiz implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Integer addScanActCount; private Integer addScanActCount;
@TableField(exist = false)
private String queueCode; private String queueCode;
private Integer ledNum;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }

@ -85,7 +85,8 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
one.setGreen(collectOrderBiz.getId()); one.setGreen(collectOrderBiz.getId());
} }
collectOrderBiz.setQueueCode(sysWorkplaceQueue.getCode());
collectOrderBiz.setLedNum(collectLedGroupRequest.getLednum());
ledGroupRequest.getData().add(collectLedGroupRequest); ledGroupRequest.getData().add(collectLedGroupRequest);
updateById(one); updateById(one);
} }

Loading…
Cancel
Save