仓库管理修改

liweidong
wusiyu 4 days ago
parent 4dd0cc3f7e
commit 020bcc4b18
  1. 6
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
  2. 4
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StClassRequestServiceImpl.java
  3. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java
  4. 4
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
  5. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java

@ -198,7 +198,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName());
String roleId = roleIdResp.getData(); String roleId = roleIdResp.getData();
approvalRecord.setNextRoleId(Long.valueOf(roleId)); approvalRecord.setNextRoleId(Long.valueOf(roleId));
mesApprovalRecordClient.save(approvalRecord);
// 启动流程(原逻辑完全保留) // 启动流程(原逻辑完全保留)
@ -253,7 +253,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
// updateRecord.setNextRoleId(Long.valueOf(roleId)); // updateRecord.setNextRoleId(Long.valueOf(roleId));
updateRecord.setNextUserName("厂长,副厂长"); updateRecord.setNextUserName("厂长,副厂长");
updateRecord.setStatus(Integer.valueOf(approvalResult)); updateRecord.setStatus(Integer.valueOf(approvalResult));
mesApprovalRecordClient.update(updateRecord);
// } else { // } else {
// throw new RuntimeException("仅保管员可执行审批操作!"); // throw new RuntimeException("仅保管员可执行审批操作!");
@ -275,7 +275,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
// updateRecord.setNextRoleId(Long.valueOf(roleId)); // updateRecord.setNextRoleId(Long.valueOf(roleId));
updateRecord.setNextUserName("厂长,副厂长"); updateRecord.setNextUserName("厂长,副厂长");
updateRecord.setStatus(Integer.valueOf(approvalResult)); updateRecord.setStatus(Integer.valueOf(approvalResult));
mesApprovalRecordClient.update(updateRecord);
} }
} }

@ -115,7 +115,7 @@ public class StClassRequestServiceImpl extends BaseServiceImpl<StClassRequestMap
approvalRecord.setNextUserId(ccr.getApprover()); approvalRecord.setNextUserId(ccr.getApprover());
approvalRecord.setNextUserName(ruser.getRealName()); approvalRecord.setNextUserName(ruser.getRealName());
mesApprovalRecordClient.save(approvalRecord);
} else { } else {
// 普通物料:无需审批,状态设为【无需审批】+ 直接发布 // 普通物料:无需审批,状态设为【无需审批】+ 直接发布
ccr.setApprovalStatus(StClassRequest.APPROVAL_STATUS_NONE); ccr.setApprovalStatus(StClassRequest.APPROVAL_STATUS_NONE);
@ -204,7 +204,7 @@ public class StClassRequestServiceImpl extends BaseServiceImpl<StClassRequestMap
// updateRecord.setNextRoleId(Long.valueOf(roleId)); // updateRecord.setNextRoleId(Long.valueOf(roleId));
updateRecord.setNextUserId(ccr.getApprover()); updateRecord.setNextUserId(ccr.getApprover());
updateRecord.setStatus(Integer.valueOf(approvalResult)); updateRecord.setStatus(Integer.valueOf(approvalResult));
mesApprovalRecordClient.update(updateRecord);
}else { }else {
throw new RuntimeException("仅工艺员可执行审批操作!"); throw new RuntimeException("仅工艺员可执行审批操作!");

@ -139,7 +139,7 @@ public class StMoldApplyForServiceImpl extends BaseServiceImpl<StMoldApplyForMap
R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName());
String roleId = roleIdResp.getData(); String roleId = roleIdResp.getData();
// approvalRecord.setNextRoleId(Long.valueOf(roleId)); // approvalRecord.setNextRoleId(Long.valueOf(roleId));
mesApprovalRecordClient.save(approvalRecord);
} }
return this.updateBatchById(list); return this.updateBatchById(list);
} }

@ -101,7 +101,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
approvalRecord.setNextUserId(stOtherOutRecord.getApprover()); approvalRecord.setNextUserId(stOtherOutRecord.getApprover());
approvalRecord.setNextUserName(ruser.getRealName()); approvalRecord.setNextUserName(ruser.getRealName());
mesApprovalRecordClient.save(approvalRecord);
} }
@ -131,7 +131,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
// updateRecord.setNextRoleId(Long.valueOf(roleId)); // updateRecord.setNextRoleId(Long.valueOf(roleId));
updateRecord.setNextUserId(stOtherOutRecord.getApprover()); updateRecord.setNextUserId(stOtherOutRecord.getApprover());
updateRecord.setStatus(Integer.valueOf(approvalResult)); updateRecord.setStatus(Integer.valueOf(approvalResult));
mesApprovalRecordClient.update(updateRecord);
this.addOtherOutRecord(stOtherOutRecord, approver); this.addOtherOutRecord(stOtherOutRecord, approver);
}else { }else {

@ -158,7 +158,7 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl<StWmsRequestMapper,
updateRecord.setOpinion(""); updateRecord.setOpinion("");
updateRecord.setNextRoleId(Long.valueOf(roleId)); updateRecord.setNextRoleId(Long.valueOf(roleId));
updateRecord.setStatus(Integer.valueOf(approvalResult)); updateRecord.setStatus(Integer.valueOf(approvalResult));
mesApprovalRecordClient.update(updateRecord);
bo.setDrawQuantity(afterQty); bo.setDrawQuantity(afterQty);
bo.setSurDrawQty(bo.getBuyQty() - afterQty); bo.setSurDrawQty(bo.getBuyQty() - afterQty);

Loading…
Cancel
Save