18231669351
/
reagent_manage
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修复单据提交时未考虑前置任务失败的问题

Browse Source
master
toesbieya 6 years ago
parent 0a972c3005
commit 652c64907a
8 changed files with 120 additions and 96 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 27
      java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseInboundService.java
  2. 27
      java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseOrderService.java
  3. 27
      java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOrderService.java
  4. 27
      java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOutboundService.java
  5. 27
      java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseInboundService.java
  6. 27
      java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseOrderService.java
  7. 27
      java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOrderService.java
  8. 27
      java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOutboundService.java

27
java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseInboundService.java
Unescape View File

@ -104,19 +104,22 @@ public class PurchaseInboundService {
boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); boolean isFirstCreate = StringUtils.isEmpty(doc.getId());
R result = isFirstCreate ? addMain(doc) : updateMain(doc); R result = isFirstCreate ? addMain(doc) : updateMain(doc);
historyMapper.insert( if (result.isSuccess()) {
BizDocHistory.builder() historyMapper.insert(
.pid(doc.getId()) BizDocHistory.builder()
.type(DocHistoryEnum.COMMIT.getCode()) .pid(doc.getId())
.uid(doc.getCid()) .type(DocHistoryEnum.COMMIT.getCode())
.uname(doc.getCname()) .uid(doc.getCid())
.statusBefore(DocStatusEnum.DRAFT.getCode()) .uname(doc.getCname())
.statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) .statusBefore(DocStatusEnum.DRAFT.getCode())
.time(System.currentTimeMillis()) .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode())
.build() .time(System.currentTimeMillis())
); .build()
);
result.setMsg("提交成功");
}
else result.setMsg("提交失败，" + result.getMsg());
result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg());
return result; return result;
} }

27
java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseOrderService.java
Unescape View File

@ -96,19 +96,22 @@ public class PurchaseOrderService {
boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); boolean isFirstCreate = StringUtils.isEmpty(doc.getId());
R result = isFirstCreate ? addMain(doc) : updateMain(doc); R result = isFirstCreate ? addMain(doc) : updateMain(doc);
historyMapper.insert( if (result.isSuccess()) {
BizDocHistory.builder() historyMapper.insert(
.pid(doc.getId()) BizDocHistory.builder()
.type(DocHistoryEnum.COMMIT.getCode()) .pid(doc.getId())
.uid(doc.getCid()) .type(DocHistoryEnum.COMMIT.getCode())
.uname(doc.getCname()) .uid(doc.getCid())
.statusBefore(DocStatusEnum.DRAFT.getCode()) .uname(doc.getCname())
.statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) .statusBefore(DocStatusEnum.DRAFT.getCode())
.time(System.currentTimeMillis()) .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode())
.build() .time(System.currentTimeMillis())
); .build()
);
result.setMsg("提交成功");
}
else result.setMsg("提交失败，" + result.getMsg());
result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg());
return result; return result;
} }

27
java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOrderService.java
Unescape View File

@ -99,19 +99,22 @@ public class SellOrderService {
boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); boolean isFirstCreate = StringUtils.isEmpty(doc.getId());
R result = isFirstCreate ? addMain(doc) : updateMain(doc); R result = isFirstCreate ? addMain(doc) : updateMain(doc);
historyMapper.insert( if (result.isSuccess()) {
BizDocHistory.builder() historyMapper.insert(
.pid(doc.getId()) BizDocHistory.builder()
.type(DocHistoryEnum.COMMIT.getCode()) .pid(doc.getId())
.uid(doc.getCid()) .type(DocHistoryEnum.COMMIT.getCode())
.uname(doc.getCname()) .uid(doc.getCid())
.statusBefore(DocStatusEnum.DRAFT.getCode()) .uname(doc.getCname())
.statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) .statusBefore(DocStatusEnum.DRAFT.getCode())
.time(System.currentTimeMillis()) .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode())
.build() .time(System.currentTimeMillis())
); .build()
);
result.setMsg("提交成功");
}
else result.setMsg("提交失败，" + result.getMsg());
result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg());
return result; return result;
} }

27
java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOutboundService.java
Unescape View File

@ -107,19 +107,22 @@ public class SellOutboundService {
boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); boolean isFirstCreate = StringUtils.isEmpty(doc.getId());
R result = isFirstCreate ? addMain(doc) : updateMain(doc); R result = isFirstCreate ? addMain(doc) : updateMain(doc);
historyMapper.insert( if (result.isSuccess()) {
BizDocHistory.builder() historyMapper.insert(
.pid(doc.getId()) BizDocHistory.builder()
.type(DocHistoryEnum.COMMIT.getCode()) .pid(doc.getId())
.uid(doc.getCid()) .type(DocHistoryEnum.COMMIT.getCode())
.uname(doc.getCname()) .uid(doc.getCid())
.statusBefore(DocStatusEnum.DRAFT.getCode()) .uname(doc.getCname())
.statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) .statusBefore(DocStatusEnum.DRAFT.getCode())
.time(System.currentTimeMillis()) .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode())
.build() .time(System.currentTimeMillis())
); .build()
);
result.setMsg("提交成功");
}
else result.setMsg("提交失败，" + result.getMsg());
result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg());
return result; return result;
} }

27
java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseInboundService.java
Unescape View File

@ -104,19 +104,22 @@ public class BizPurchaseInboundService {
boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); boolean isFirstCreate = StringUtils.isEmpty(doc.getId());
R result = isFirstCreate ? addMain(doc) : updateMain(doc); R result = isFirstCreate ? addMain(doc) : updateMain(doc);
historyMapper.insert( if (result.isSuccess()) {
BizDocHistory.builder() historyMapper.insert(
.pid(doc.getId()) BizDocHistory.builder()
.type(DocHistoryEnum.COMMIT.getCode()) .pid(doc.getId())
.uid(doc.getCid()) .type(DocHistoryEnum.COMMIT.getCode())
.uname(doc.getCname()) .uid(doc.getCid())
.statusBefore(DocStatusEnum.DRAFT.getCode()) .uname(doc.getCname())
.statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) .statusBefore(DocStatusEnum.DRAFT.getCode())
.time(System.currentTimeMillis()) .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode())
.build() .time(System.currentTimeMillis())
); .build()
);
result.setMsg("提交成功");
}
else result.setMsg("提交失败，" + result.getMsg());
result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg());
return result; return result;
} }

27
java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseOrderService.java
Unescape View File

@ -97,19 +97,22 @@ public class BizPurchaseOrderService {
boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); boolean isFirstCreate = StringUtils.isEmpty(doc.getId());
R result = isFirstCreate ? addMain(doc) : updateMain(doc); R result = isFirstCreate ? addMain(doc) : updateMain(doc);
historyMapper.insert( if (result.isSuccess()) {
BizDocHistory.builder() historyMapper.insert(
.pid(doc.getId()) BizDocHistory.builder()
.type(DocHistoryEnum.COMMIT.getCode()) .pid(doc.getId())
.uid(doc.getCid()) .type(DocHistoryEnum.COMMIT.getCode())
.uname(doc.getCname()) .uid(doc.getCid())
.statusBefore(DocStatusEnum.DRAFT.getCode()) .uname(doc.getCname())
.statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) .statusBefore(DocStatusEnum.DRAFT.getCode())
.time(System.currentTimeMillis()) .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode())
.build() .time(System.currentTimeMillis())
); .build()
);
result.setMsg("提交成功");
}
else result.setMsg("提交失败，" + result.getMsg());
result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg());
return result; return result;
} }

27
java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOrderService.java
Unescape View File

@ -101,19 +101,22 @@ public class BizSellOrderService {
boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); boolean isFirstCreate = StringUtils.isEmpty(doc.getId());
R result = isFirstCreate ? addMain(doc) : updateMain(doc); R result = isFirstCreate ? addMain(doc) : updateMain(doc);
historyMapper.insert( if (result.isSuccess()) {
BizDocHistory.builder() historyMapper.insert(
.pid(doc.getId()) BizDocHistory.builder()
.type(DocHistoryEnum.COMMIT.getCode()) .pid(doc.getId())
.uid(doc.getCid()) .type(DocHistoryEnum.COMMIT.getCode())
.uname(doc.getCname()) .uid(doc.getCid())
.statusBefore(DocStatusEnum.DRAFT.getCode()) .uname(doc.getCname())
.statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) .statusBefore(DocStatusEnum.DRAFT.getCode())
.time(System.currentTimeMillis()) .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode())
.build() .time(System.currentTimeMillis())
); .build()
);
result.setMsg("提交成功");
}
else result.setMsg("提交失败，" + result.getMsg());
result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg());
return result; return result;
} }

27
java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOutboundService.java
Unescape View File

@ -109,19 +109,22 @@ public class BizSellOutboundService {
boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); boolean isFirstCreate = StringUtils.isEmpty(doc.getId());
R result = isFirstCreate ? addMain(doc) : updateMain(doc); R result = isFirstCreate ? addMain(doc) : updateMain(doc);
historyMapper.insert( if (result.isSuccess()) {
BizDocHistory.builder() historyMapper.insert(
.pid(doc.getId()) BizDocHistory.builder()
.type(DocHistoryEnum.COMMIT.getCode()) .pid(doc.getId())
.uid(doc.getCid()) .type(DocHistoryEnum.COMMIT.getCode())
.uname(doc.getCname()) .uid(doc.getCid())
.statusBefore(DocStatusEnum.DRAFT.getCode()) .uname(doc.getCname())
.statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) .statusBefore(DocStatusEnum.DRAFT.getCode())
.time(System.currentTimeMillis()) .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode())
.build() .time(System.currentTimeMillis())
); .build()
);
result.setMsg("提交成功");
}
else result.setMsg("提交失败，" + result.getMsg());
result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg());
return result; return result;
} }

Write Preview
Loading…
Cancel
Save