|
|
|
@ -120,6 +120,8 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
IoCollectOrderBackupService ioCollectOrderBackupService;
|
|
|
|
|
@Resource
|
|
|
|
|
IoCollectSetService collectSetService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -1714,6 +1716,8 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
|
|
|
|
|
//工位上货 只允许上货一个产品 开关以及控制
|
|
|
|
|
IoCollectSet collectSet = collectSetService.getSet();
|
|
|
|
|
// 判断货位里面是否有相同产品
|
|
|
|
|
if (orderEntity != null && StrUtil.isNotEmpty(orderEntity.getWorkPlaceQueueCode())) {
|
|
|
|
|
SysWorkplaceQueue workplaceQueue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>()
|
|
|
|
@ -1757,8 +1761,15 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
sysWorkplaceQueue.setRelId(udiRelevanceResponse.getId() + "");
|
|
|
|
|
sysWorkplaceQueueService.updateById(sysWorkplaceQueue);
|
|
|
|
|
}
|
|
|
|
|
} else if (orderEntity != null && CollUtil.isNotEmpty(codeEnttitys) && IntUtil.value(collectSet.getSplitOutOnlyProductSwitch())) {
|
|
|
|
|
for (IoCodeTempEntity ioOrderDetailCodeEntity : codeEnttitys) {
|
|
|
|
|
//开启了 只允许上货一个产品开关
|
|
|
|
|
if (!ioOrderDetailCodeEntity.getRelId().equals(udiRelevanceResponse.getId())) {
|
|
|
|
|
return ResultVOUtils.error(507, "当前单据下只允许上货单一产品!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|