委託驗收外網bug

dev
anthonywj 2 years ago
parent 390f69b215
commit 658fb65413

@ -336,8 +336,12 @@ public class IoOrderReviewController extends BaseController {
orderEntity.setUllageSupNo(supplementOrder.getBillNo()); orderEntity.setUllageSupNo(supplementOrder.getBillNo());
orderService.update(orderEntity); orderService.update(orderEntity);
codeTempService.insertBatch(supplementCodes); codeTempService.insertBatch(supplementCodes);
for (IoCodeTempEntity codeTempEntity : supplementCodes) { // for (IoCodeTempEntity codeTempEntity : supplementCodes) {
addInoutService.genOrderDetailCode(supplementOrder, codeTempEntity); // addInoutService.genOrderDetailCode(supplementOrder, codeTempEntity);
// }
addInoutService.dealProcess(supplementOrder);
if (!ioCheckInoutService.checkManual(supplementOrder.getBillNo())) {
ioCheckInoutService.check(supplementOrder.getBillNo());
} }
} }
@ -478,11 +482,7 @@ public class IoOrderReviewController extends BaseController {
EntrustReceEntity entrustReceEntity; EntrustReceEntity entrustReceEntity;
if (StrUtil.isNotEmpty(errMsg)) { if (StrUtil.isNotEmpty(errMsg)) {
if (errMsg.equals("委托验收")) { if (errMsg.equals("委托验收")) {
IoOrderEntity orderEntity = orderService.findByBillNo(billNo);
entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), userId);
if (entrustReceEntity != null) {
acceptOrderEntity.setEntrust(true); acceptOrderEntity.setEntrust(true);
}
// else return ResultVOUtils.error(500, "无权限验收!"); // else return ResultVOUtils.error(500, "无权限验收!");
} else } else
return ResultVOUtils.error(500, errMsg); return ResultVOUtils.error(500, errMsg);
@ -556,8 +556,6 @@ public class IoOrderReviewController extends BaseController {
//校验用户是否验收权限 //校验用户是否验收权限
private String checkReviewAuth(String orderId, String userId) { private String checkReviewAuth(String orderId, String userId) {
IoOrderEntity orderEntity = orderService.findByBillNo(orderId); IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
if (orderEntity == null) { if (orderEntity == null) {
ReviewSpmsRequest reviewSpmsRequest = new ReviewSpmsRequest(); ReviewSpmsRequest reviewSpmsRequest = new ReviewSpmsRequest();
reviewSpmsRequest.setBillNo(orderId); reviewSpmsRequest.setBillNo(orderId);
@ -567,7 +565,6 @@ public class IoOrderReviewController extends BaseController {
} else { } else {
return "单据不存在!"; return "单据不存在!";
} }
} }

Loading…
Cancel
Save