|
|
|
@ -185,20 +185,20 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
String code = addEnterCodeRequest.getCode();
|
|
|
|
|
//先判断是否已完成
|
|
|
|
|
IoCollectOrderBackup byBillNo = ioCollectOrderBackupService.getByBillNo(code);
|
|
|
|
|
if (byBillNo != null){
|
|
|
|
|
if (byBillNo != null) {
|
|
|
|
|
return ResultVOUtils.error(500, "该单据已处理完成,请勿重复处理!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//取药确认
|
|
|
|
|
if (addEnterCodeRequest.getSelectType() != null){
|
|
|
|
|
List<SysOrderLed> orderLeds = sysOrderLedService.list(new LambdaQueryWrapper<SysOrderLed>().isNull(SysOrderLed::getOrderId)
|
|
|
|
|
.or()
|
|
|
|
|
.eq(SysOrderLed::getOrderId, "")
|
|
|
|
|
.orderByAsc(SysOrderLed::getLedNum));
|
|
|
|
|
//如果为null 当前灯组已满
|
|
|
|
|
if (orderLeds == null || orderLeds.size() == 0){
|
|
|
|
|
return ResultVOUtils.error(500, "灯组已满!");
|
|
|
|
|
}
|
|
|
|
|
if (addEnterCodeRequest.getSelectType() != null) {
|
|
|
|
|
List<SysOrderLed> orderLeds = sysOrderLedService.list(new LambdaQueryWrapper<SysOrderLed>().isNull(SysOrderLed::getOrderId)
|
|
|
|
|
.or()
|
|
|
|
|
.eq(SysOrderLed::getOrderId, "")
|
|
|
|
|
.orderByAsc(SysOrderLed::getLedNum));
|
|
|
|
|
//如果为null 当前灯组已满
|
|
|
|
|
if (orderLeds == null || orderLeds.size() == 0) {
|
|
|
|
|
return ResultVOUtils.error(500, "灯组已满!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
IoCollectOrderResponse collectOrder = collectOrderService.unionSearch(null, addEnterCodeRequest.getBusType(), code);
|
|
|
|
@ -1357,7 +1357,7 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
@Autowired
|
|
|
|
|
RelCodeBatchService relCodeBatchService;
|
|
|
|
|
|
|
|
|
|
// @Transactional(rollbackFor = Exception.class)
|
|
|
|
@ -1649,7 +1649,7 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
|
|
|
|
|
//如果是阿里拉的单据会有批次号
|
|
|
|
|
IoCollectOrderCodeMan codeMan = ioCollectOrderCodeManService.getOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>().eq(IoCollectOrderCodeMan::getUdiCode, code));
|
|
|
|
|
if (codeMan != null){
|
|
|
|
|
if (codeMan != null) {
|
|
|
|
|
codeEnttity.setBatchNo(codeMan.getBatchNo());
|
|
|
|
|
codeEnttity.setProduceDate(codeMan.getProductDate());
|
|
|
|
|
codeEnttity.setExpireDate(codeMan.getExpireDate());
|
|
|
|
@ -1941,7 +1941,7 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
relCodeBatchService.threadUpdateIoCodeTempEntity(code);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
@Autowired
|
|
|
|
|
RelCodeDetailService relCodeDetailService;
|
|
|
|
|
|
|
|
|
|
//前端扫码提交(药品)
|
|
|
|
|