单据转备份表问题

dev_2.5_optimize
yewj 5 months ago
parent b8230fb66d
commit ede6b0244a

@ -467,14 +467,14 @@ public class LoginController extends BaseController {
OutputStream os = null; OutputStream os = null;
try { try {
// 读取图片 // 读取图片
BufferedImage image = ImageIO.read(new FileInputStream(file)); BufferedImage image = ImageIO.read(new FileInputStream(file));
response.setContentType("image/png"); response.setContentType("image/png");
os = response.getOutputStream(); os = response.getOutputStream();
if (image != null) { if (image != null) {
ImageIO.write(image, "png", os); ImageIO.write(image, "png", os);
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);

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

@ -397,8 +397,6 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
} }
} }
}); });
} }

@ -406,6 +406,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs) { for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs) {
IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup(); IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup); BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup);
ioCollectOrderBizBackup.setId(IdUtil.getSnowflake().nextId());
ioCollectOrderBizBackups.add(ioCollectOrderBizBackup); ioCollectOrderBizBackups.add(ioCollectOrderBizBackup);
} }
ioCollectOrderBizBackupService.saveBatch(ioCollectOrderBizBackups); ioCollectOrderBizBackupService.saveBatch(ioCollectOrderBizBackups);
@ -650,7 +651,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
collectOrderBiz.setAutoTagStatus(1); collectOrderBiz.setAutoTagStatus(1);
} }
ThreadUtil.execAsync(() -> { ThreadUtil.execAsync(() -> {
ioCollectLedGroupService.openLed(collectOrderBizs); ioCollectLedGroupService.openLed(collectOrderBizs);
} }
); );
collectOrderBizService.updateBatchById(collectOrderBizs); collectOrderBizService.updateBatchById(collectOrderBizs);

Loading…
Cancel
Save