提交 be437d28 authored 作者: 邓砥奕's avatar 邓砥奕

修改入库bug

上级 edbfac00
...@@ -120,7 +120,7 @@ public class AllotBillController { ...@@ -120,7 +120,7 @@ public class AllotBillController {
deviceLogService.addLog(deviceLogDto); deviceLogService.addLog(deviceLogDto);
} }
} }
log.info("[配发模块]:"+allotBillEntity.getSendUnit()+"对" + allotBillEntity.getReceiveUnit() + "发起配发"); log.info("[配发模块]:" + allotBillEntity.getSendUnit() + "对" + allotBillEntity.getReceiveUnit() + "发起配发");
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
return ResponseEntity.ok(new ResultObj(allotBillEntity, "发起成功")); return ResponseEntity.ok(new ResultObj(allotBillEntity, "发起成功"));
} }
...@@ -160,7 +160,7 @@ public class AllotBillController { ...@@ -160,7 +160,7 @@ public class AllotBillController {
} }
} }
//添加出库白名单 //添加出库白名单
inputOutputDeviceService.addWhiteDevices(ids,userUtils.getCurrentUnitId(),1); inputOutputDeviceService.addWhiteDevices(ids, userUtils.getCurrentUnitId(), 1);
log.info("[配发模块]:配发审核成功并出库"); log.info("[配发模块]:配发审核成功并出库");
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
return ResponseEntity.ok("审核成功"); return ResponseEntity.ok("审核成功");
......
...@@ -151,6 +151,7 @@ public class StorageBillController { ...@@ -151,6 +151,7 @@ public class StorageBillController {
deviceLibraryEntity.setStorageBillId(storageBillId); deviceLibraryEntity.setStorageBillId(storageBillId);
deviceLibraryEntity.setLocationUnit(userUtils.getCurrentUserUnitName()); deviceLibraryEntity.setLocationUnit(userUtils.getCurrentUserUnitName());
deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName()); deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName());
deviceLibraryEntity.setPartParentId(null);
//如果不是单独的配件,设置父装备id为上一个装备的id //如果不是单独的配件,设置父装备id为上一个装备的id
if (d.getIsSinglePart() == 0) { if (d.getIsSinglePart() == 0) {
if (deviceLibraryEntity.getIsPart() == 0) { if (deviceLibraryEntity.getIsPart() == 0) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论