diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index bdbd22fb..44727343 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -403,7 +403,7 @@ public class DepositoryRecordController { if (recordId != null) { // 如果当前id不是空 获取对应的入库仓库id String type = typeList.get(i); - if("mt".equals(type)){ + if ("mt".equals(type)) { Long mtId = mtIdList.get(i); // 将对应仓库与订单id添加映射关系 List integers = MtIdToRecordId.get(mtId); @@ -416,7 +416,7 @@ public class DepositoryRecordController { integers.add(recordId); MtIdToRecordId.put(mtId, integers); } - }else{ + } else { Integer did = depositoryIdList.get(i); // 将对应仓库与订单id添加映射关系 List integers = depositoryIdToRecordId.get(did); @@ -524,7 +524,7 @@ public class DepositoryRecordController { String crypt = Md5.crypt(header); map.put("applicantId", userToken.getId()); // 获取当前部门负责人 - List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken,crypt); + List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (int i = 0; i < departmentHeadByUsers.size(); i++) { @@ -853,7 +853,11 @@ public class DepositoryRecordController { // 获取对应主订单 List list = new ArrayList<>(); Integer countBy = 0; - if (Integer.compare(userByPort.getMaindeparment(), 361) == 0) { + Integer role = userByPort.getIsadmin(); + if (role == null) { + role = 1; + } + if ((Integer.compare(userByPort.getMaindeparment(), 361) == 0) || role == 4) { list = depositoryRecordService.findApplicationOutRecordPByCondition(map, userByPort); countBy = depositoryRecordService.findApplicationOutRecordPCountByCondition(map); } else { @@ -897,7 +901,7 @@ public class DepositoryRecordController { SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); // 获取当前拆单记录与基础单位进制 int splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); - BigDecimal bg = new BigDecimal(inventory.getPrice() / splitInfoScaleQuantity * applicationOutRecordMin.getQuantity()); + BigDecimal bg = new BigDecimal(inventory.getPrice() / splitInfoScaleQuantity * applicationOutRecordMin.getQuantity()); double newprice = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); sumPrice += newprice; } @@ -1034,7 +1038,7 @@ public class DepositoryRecordController { String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken,crypt); + List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (int i = 0; i < departmentHeadByUsers.size(); i++) { @@ -1358,7 +1362,7 @@ public class DepositoryRecordController { if (recordId != null) { // 如果当前id不是空 获取对应的入库仓库id String type = typeList.get(i); - if("mt".equals(type)){ + if ("mt".equals(type)) { Long mtId = mtIdList.get(i); // 将对应仓库与订单id添加映射关系 List integers = MtIdToRecordId.get(mtId); @@ -1371,7 +1375,7 @@ public class DepositoryRecordController { integers.add(recordId); MtIdToRecordId.put(mtId, integers); } - }else{ + } else { Integer did = depositoryIdList.get(i); // 将对应仓库与订单id添加映射关系 List integers = depositoryIdToRecordId.get(did); @@ -1456,7 +1460,7 @@ public class DepositoryRecordController { } else if ("out".equals(type)) { // 获取部门负责人 - List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken,crypt); + List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (int i = 0; i < departmentHeadByUsers.size(); i++) { @@ -1592,8 +1596,7 @@ public class DepositoryRecordController { typeList.add((String) inRecord.get("inType")); depositoryIdList.add(ObjectFormatUtil.toInteger(inRecord.get("depositoryId"))); } - } - else { + } else { success += depositoryRecordService.applicationInPlace(inRecord, false); recordIds.add(ObjectFormatUtil.toInteger(inRecord.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(inRecord.get("mtId"))); @@ -1613,7 +1616,7 @@ public class DepositoryRecordController { if (recordId != null) { // 如果当前id不是空 获取对应的入库仓库id String type = typeList.get(i); - if("mt".equals(type)){ + if ("mt".equals(type)) { Long mtId = mtIdList.get(i); // 将对应仓库与订单id添加映射关系 List integers = MtIdToRecordId.get(mtId); @@ -1626,7 +1629,7 @@ public class DepositoryRecordController { integers.add(recordId); MtIdToRecordId.put(mtId, integers); } - }else{ + } else { Integer did = depositoryIdList.get(i); // 将对应仓库与订单id添加映射关系 List integers = depositoryIdToRecordId.get(did); @@ -1708,8 +1711,7 @@ public class DepositoryRecordController { } } }).start(); - } - else if ("out".equals(type)) { + } else if ("out".equals(type)) { Map mainRecord = new HashMap<>(); Integer sumQuantity = 0; for (Object o : quantitys) { @@ -1717,7 +1719,7 @@ public class DepositoryRecordController { sumQuantity += integer; } // 获取部门负责人 - List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken,crypt); + List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (int i = 0; i < departmentHeadByUsers.size(); i++) { @@ -1930,7 +1932,7 @@ public class DepositoryRecordController { String crypt = Md5.crypt(header); Integer integer = depositoryRecordService.updateOutMinRecordInfo(map, userToken, crypt); - return CrudUtil.updateHandle(integer,1); + return CrudUtil.updateHandle(integer, 1); } else { throw new MyException("缺少必要参数"); } diff --git a/target/classes/templates/pages/application/form-step-look_back.html b/target/classes/templates/pages/application/form-step-look_back.html index fb1fcc8b..a7b36a52 100644 --- a/target/classes/templates/pages/application/form-step-look_back.html +++ b/target/classes/templates/pages/application/form-step-look_back.html @@ -108,16 +108,16 @@ - 仓储负责人 + - 仓储负责人 + - 仓储负责人备注 + 2016-11-28 - 仓储负责人审核时间 + 2016-11-28