Browse Source

修改仓储中心提交出库申请时由自己审批

lwx_dev
erdanergou 3 years ago
parent
commit
2cd220c64a
  1. 32
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 16
      src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java

32
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@ -461,6 +461,14 @@ public class DepositoryRecordController {
// } // }
departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
if (Integer.compare(userToken.getMaindeparment(), 361) == 0) {
departmentHeadId = new StringBuilder(userToken.getId());
String workwechat = userToken.getWorkwechat();
if(workwechat == null || "".equals(workwechat)){
workwechat = userToken.getWechat();
}
departMentHeadQyWxName = new StringBuilder(workwechat);
}
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
List<Integer> params = (List<Integer>) map.get("params"); List<Integer> params = (List<Integer>) map.get("params");
Integer integer = 0; Integer integer = 0;
@ -990,6 +998,14 @@ public class DepositoryRecordController {
// } // }
departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
if (Integer.compare(userToken.getMaindeparment(), 361) == 0) {
departmentHeadId = new StringBuilder(userToken.getId());
String workwechat = userToken.getWorkwechat();
if(workwechat == null || "".equals(workwechat)){
workwechat = userToken.getWechat();
}
departMentHeadQyWxName = new StringBuilder(workwechat);
}
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
map.put("departMentHeadQyWxName", departMentHeadQyWxName.toString()); map.put("departMentHeadQyWxName", departMentHeadQyWxName.toString());
List<Integer> params = (List<Integer>) map.get("params"); List<Integer> params = (List<Integer>) map.get("params");
@ -1274,6 +1290,14 @@ public class DepositoryRecordController {
// } // }
departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
if (Integer.compare(userToken.getMaindeparment(), 361) == 0) {
departmentHeadId = new StringBuilder(userToken.getId());
String workwechat = userToken.getWorkwechat();
if(workwechat == null || "".equals(workwechat)){
workwechat = userToken.getWechat();
}
departMentHeadQyWxName = new StringBuilder(workwechat);
}
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
// 待出库物料id // 待出库物料id
Integer mid = ObjectFormatUtil.toInteger(map.get("iid")); Integer mid = ObjectFormatUtil.toInteger(map.get("iid"));
@ -1414,6 +1438,14 @@ public class DepositoryRecordController {
// } // }
departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
if (Integer.compare(userToken.getMaindeparment(), 361) == 0) {
departmentHeadId = new StringBuilder(userToken.getId());
String workwechat = userToken.getWorkwechat();
if(workwechat == null || "".equals(workwechat)){
workwechat = userToken.getWechat();
}
departMentHeadQyWxName = new StringBuilder(workwechat);
}
mainRecord.put("applicantId", userToken.getId()); mainRecord.put("applicantId", userToken.getId());
mainRecord.put("applyRemark", ""); mainRecord.put("applyRemark", "");
mainRecord.put("quantity", sumQuantity.toString()); mainRecord.put("quantity", sumQuantity.toString());

16
src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java

@ -618,6 +618,14 @@ public class GroupController {
// } // }
departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
if (Integer.compare(userToken.getMaindeparment(), 361) == 0) {
departmentHeadId = new StringBuilder(userToken.getId());
String workwechat = userToken.getWorkwechat();
if(workwechat == null || "".equals(workwechat)){
workwechat = userToken.getWechat();
}
departMentHeadQyWxName = new StringBuilder(workwechat);
}
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
// 获取当前提交数 // 获取当前提交数
List<String> params = (List<String>) map.get("params"); List<String> params = (List<String>) map.get("params");
@ -785,6 +793,14 @@ public class GroupController {
// } // }
departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
if (Integer.compare(userToken.getMaindeparment(), 361) == 0) {
departmentHeadId = new StringBuilder(userToken.getId());
String workwechat = userToken.getWorkwechat();
if(workwechat == null || "".equals(workwechat)){
workwechat = userToken.getWechat();
}
departMentHeadQyWxName = new StringBuilder(workwechat);
}
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
// 获取当前部门所拥有的仓库 // 获取当前部门所拥有的仓库

Loading…
Cancel
Save