|
|
|
|
@ -1098,43 +1098,19 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
|
* @return R<BoxbarcodeDetailsVO> 箱条码详细信息 |
|
|
|
|
*/ |
|
|
|
|
@Override |
|
|
|
|
public R getBoxbarcodeDetails(String orderBindId,String boxBarcode) { |
|
|
|
|
public R getBoxbarcodeDetails(String boxBarcode,boolean isDetail) { |
|
|
|
|
|
|
|
|
|
List<OrderBind> orderBindList = null; |
|
|
|
|
String bindBoxBarcode = null; |
|
|
|
|
|
|
|
|
|
// 参数互斥校验：只能传一个
|
|
|
|
|
if (!StringUtils.isBlank(orderBindId) && !StringUtils.isBlank(boxBarcode)) { |
|
|
|
|
return R.fail("orderBindId 和 boxBarcode 只能传入一个"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// orderBindId不为空时
|
|
|
|
|
if (!StringUtils.isBlank(orderBindId)) { |
|
|
|
|
Long obId = Long.parseLong(orderBindId); |
|
|
|
|
OrderBind orderBind = orderBindService.getById(obId); |
|
|
|
|
|
|
|
|
|
if (null == orderBind) { |
|
|
|
|
return R.fail("箱条码数据不存在"); |
|
|
|
|
} |
|
|
|
|
if (StringUtils.isBlank(orderBind.getBoxBarcode())) { |
|
|
|
|
return R.fail("箱条码不存在"); |
|
|
|
|
} |
|
|
|
|
if (null == orderBind.getTaskId()) { |
|
|
|
|
return R.fail("任务不存在"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 使用查出来的 boxBarcode 和 taskId 继续查询
|
|
|
|
|
bindBoxBarcode = orderBind.getBoxBarcode(); |
|
|
|
|
Long taskId = orderBind.getTaskId(); |
|
|
|
|
|
|
|
|
|
if (isDetail) { |
|
|
|
|
orderBindList = orderBindService.list( |
|
|
|
|
Wrappers.lambdaQuery(OrderBind.class) |
|
|
|
|
.eq(OrderBind::getBoxBarcode, bindBoxBarcode) |
|
|
|
|
.eq(OrderBind::getTaskId, taskId) |
|
|
|
|
.eq(OrderBind::getBoxBarcode, boxBarcode) |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
// boxBarcode不为空时
|
|
|
|
|
else if (!StringUtils.isBlank(boxBarcode)) { |
|
|
|
|
bindBoxBarcode = boxBarcode; |
|
|
|
|
|
|
|
|
|
} else{ |
|
|
|
|
orderBindList = orderBindService.list( |
|
|
|
|
Wrappers.lambdaQuery(OrderBind.class) |
|
|
|
|
.eq(OrderBind::getBoxBarcode, boxBarcode) |
|
|
|
|
@ -1142,10 +1118,6 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
|
); |
|
|
|
|
bindBoxBarcode = boxBarcode; |
|
|
|
|
} |
|
|
|
|
else { |
|
|
|
|
return R.fail("请传入 orderBindId 或 boxBarcode"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 无绑定记录直接返回默认值
|
|
|
|
|
@ -1315,7 +1287,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 3. 查询最新任务关联的箱条码详情并填充VO
|
|
|
|
|
R boxbarcodeDetailsR = getBoxbarcodeDetails(null, taskList.get(0).getBoxBarcode()); |
|
|
|
|
R boxbarcodeDetailsR = getBoxbarcodeDetails(taskList.get(0).getBoxBarcode(),false); |
|
|
|
|
if (!boxbarcodeDetailsR.isSuccess()) { |
|
|
|
|
return boxbarcodeDetailsR; |
|
|
|
|
} |
|
|
|
|
|
liweidong-hj
16 hours ago