提交 45bda9b6 authored 作者: 133's avatar 133

[union] 提交log

上级 7a6516a1
...@@ -459,19 +459,19 @@ public class LogAspect { ...@@ -459,19 +459,19 @@ public class LogAspect {
} }
break; break;
case 14: case 14:
DeviceDestroyBillService deviceDestroyBillService = SpringUtils.getBean("deviceDestroyBillServiceImpl"); // DeviceDestroyBillService deviceDestroyBillService = SpringUtils.getBean("deviceDestroyBillServiceImpl");
if (deviceDestroyBillService != null) { // if (deviceDestroyBillService != null) {
DeviceDestroyBill deviceDestroyBill = deviceDestroyBillService.getOne(outPutTask.getBillId()); // DeviceDestroyBill deviceDestroyBill = deviceDestroyBillService.getOne(outPutTask.getBillId());
getFieldsParam(deviceDestroyBill); // getFieldsParam(deviceDestroyBill);
// if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.WAIT_UPLOAD_BILL_FILE.id))) { //// if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.WAIT_UPLOAD_BILL_FILE.id))) {
// this.fileVos.add(new FileVo("出库确认单", deviceDestroyBill.getFileName(), deviceDestroyBill.getFileUrl())); //// this.fileVos.add(new FileVo("出库确认单", deviceDestroyBill.getFileName(), deviceDestroyBill.getFileUrl()));
//// }
// if ((this.oldStatus.equals(StatusEnum.WAIT_UPLOAD_BILL_FILE.id) && this.newStatus.equals(StatusEnum.END.id))) {
// if (deviceDestroyBill.getDestroyFileName()!=null&&deviceDestroyBill.getDestroyFileUrl()!=null) {
// this.fileVos.add(new FileVo("销毁单", deviceDestroyBill.getDestroyFileName(), deviceDestroyBill.getDestroyFileUrl()));
// }
// } // }
if ((this.oldStatus.equals(StatusEnum.WAIT_UPLOAD_BILL_FILE.id) && this.newStatus.equals(StatusEnum.END.id))) { // }
if (deviceDestroyBill.getDestroyFileName()!=null&&deviceDestroyBill.getDestroyFileUrl()!=null) {
this.fileVos.add(new FileVo("销毁单", deviceDestroyBill.getDestroyFileName(), deviceDestroyBill.getDestroyFileUrl()));
}
}
}
break; break;
case 15: case 15:
DeviceRetiredBillService deviceRetiredBillService = SpringUtils.getBean("deviceRetiredBillServiceImpl"); DeviceRetiredBillService deviceRetiredBillService = SpringUtils.getBean("deviceRetiredBillServiceImpl");
...@@ -521,16 +521,16 @@ public class LogAspect { ...@@ -521,16 +521,16 @@ public class LogAspect {
} }
break; break;
case 23: case 23:
ScrapBillService scrapBillService = SpringUtils.getBean("scrapBillServiceImpl"); // ScrapBillService scrapBillService = SpringUtils.getBean("scrapBillServiceImpl");
if (scrapBillService != null) { // if (scrapBillService != null) {
ScrapBill scrapBill = scrapBillService.getOne(outPutTask.getBillId()); // ScrapBill scrapBill = scrapBillService.getOne(outPutTask.getBillId());
getFieldsParam(scrapBill); // getFieldsParam(scrapBill);
if ((this.oldStatus.equals(StatusEnum.WAIT_UPLOAD_SCRAP_FILE.id) && this.newStatus.equals(StatusEnum.END.id))) { // if ((this.oldStatus.equals(StatusEnum.WAIT_UPLOAD_SCRAP_FILE.id) && this.newStatus.equals(StatusEnum.END.id))) {
if (scrapBill.getFileName()!=null&&scrapBill.getFileUrl()!=null) { // if (scrapBill.getFileName()!=null&&scrapBill.getFileUrl()!=null) {
this.fileVos.add(new FileVo("报废单", scrapBill.getFileName(), scrapBill.getFileUrl())); // this.fileVos.add(new FileVo("报废单", scrapBill.getFileName(), scrapBill.getFileUrl()));
} // }
} // }
} // }
break; break;
default: default:
break; break;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论