|
|
|
@ -1673,7 +1673,8 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
if (splitFifoCodeEntity != null) {
|
|
|
|
|
if (!udiRelevanceResponse.getId().equals(splitFifoCodeEntity.getRelId())) {
|
|
|
|
|
orderService.deleteByBillNo(orderId);
|
|
|
|
|
return ResultVOUtils.error(507, "上货产品不符!");
|
|
|
|
|
|
|
|
|
|
return ResultVOUtils.error(507, "上货产品不符!" + "当前取货槽已被"+ udiRelevanceResponse.getCpmctymc() + "使用" );
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
//todo 判断货位里面是否有相同产品
|
|
|
|
@ -1681,7 +1682,8 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
List<IoSplitFifoCodeEntity> byRelId = fifoCodeService.findByRelId(addOrderRequest.getWorkPlaceCode(), udiRelevanceResponse1.getId());
|
|
|
|
|
if (byRelId != null && byRelId.size() > 0) {
|
|
|
|
|
orderService.deleteByBillNo(orderId);
|
|
|
|
|
return ResultVOUtils.error(507, "当前产品已绑定货位");
|
|
|
|
|
IoSplitFifoCodeEntity ioSplitFifoCodeEntity = byRelId.get(0);
|
|
|
|
|
return ResultVOUtils.error(507, "当前产品已绑定在" + ioSplitFifoCodeEntity.getWorkPlaceQueueCode() + "取货槽");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (orderEntity != null && CollUtil.isNotEmpty(codeEnttitys)) {
|
|
|
|
|