diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java index 2a878763..2eede7e7 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -396,45 +396,47 @@ public class GroupController { departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); // 获取当前提交数 - List params = (List) map.get("params"); + List params = (List) map.get("params"); // 执行结果 Integer integer = 0; // 实际结果 Integer result = 0; Integer gid = ObjectFormatUtil.toInteger(map.get("gid")); List groupInfoByGid = groupService.findGroupInfoByGid(gid); - if(groupInfoByGid != null) { - result = groupInfoByGid.size(); + if (groupInfoByGid != null) { + result += groupInfoByGid.size(); } - if (params.size() < 1 && map.size() > 3) { - try { - integer += groupService.insertApplicationOutRecord(map, userToken); // 插入主订单 - } catch (Exception e) { - return new RestResponse("", 666, new StatusInfo("出库失败", e.getMessage())); + for (String param : params) { + gid = ObjectFormatUtil.toInteger(map.get("gid" + param)); + groupInfoByGid = groupService.findGroupInfoByGid(gid); + if (groupInfoByGid != null) { + result += groupInfoByGid.size(); } - Object id = map.get("id"); // 获取主订单编号 - - // 开启一个线程开启审批 - new Thread(new Runnable() { - @Override - public void run() { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id)); - String sp_no = jsonObject.getString("sp_no"); - Map QyWxApprovalMap = new HashMap<>(); - QyWxApprovalMap.put("sp_no", sp_no); - QyWxApprovalMap.put("mainId", id.toString()); - redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap); - // 设置过期为7天 - redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS); - } - }).start(); - - } else { - } + try { + integer += groupService.insertApplicationOutRecord(map, userToken); // 插入主订单 + } catch (Exception e) { + return new RestResponse("", 666, new StatusInfo("出库失败", e.getMessage())); + } + Object id = map.get("id"); // 获取主订单编号 + // 开启一个线程开启审批 + new Thread(new Runnable() { + @Override + public void run() { + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id)); + String sp_no = jsonObject.getString("sp_no"); + Map QyWxApprovalMap = new HashMap<>(); + QyWxApprovalMap.put("sp_no", sp_no); + QyWxApprovalMap.put("mainId", id.toString()); + redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap); + // 设置过期为7天 + redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS); + } + }).start(); + if (integer != 0 && params.size() < 1) { return CrudUtil.postHandle(integer, result); - } else if (integer != 0 && params.size() > 1) { + } else if (integer != 0 && params.size() >= 1) { return CrudUtil.postHandle(integer, result); } else { return new RestResponse("", 666, new StatusInfo("出库失败", "请联系管理员进行操作")); @@ -445,13 +447,14 @@ public class GroupController { /** * 用于判断当前套餐的数量是否合法 - * @param map 套餐相关信息 + * + * @param map 套餐相关信息 * @param request * @return */ @PostMapping("/groupQuantityIsTrue") - public RestResponse groupQuantityIsTrue(@RequestBody Map map,HttpServletRequest request){ - if(map.containsKey("gid")){ + public RestResponse groupQuantityIsTrue(@RequestBody Map map, HttpServletRequest request) { + if (map.containsKey("gid")) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); // 获取当前部门所拥有的仓库 List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); @@ -466,25 +469,25 @@ public class GroupController { // 获取具体信息 GroupInfo groupInfo = groupInfoByGid.get(i); // 获取本次要出库的实际的数量 - Integer totalQuantity = groupInfo.getQuantity() * quantity; + Integer totalQuantity = groupInfo.getQuantity() * quantity; // 用于标志是否可以满足库存要求 boolean flagForInventory = false; // 获取该物料在各仓库的库存 List inventoryByMidAndDepository = materialService.findInventoryByMidAndDepository(groupInfo.getMid(), depositoryByAdminorg); for (int j = 0; j < inventoryByMidAndDepository.size(); j++) { Integer integer = inventoryByMidAndDepository.get(j); - if(integer > totalQuantity){ + if (integer >= totalQuantity) { flagForInventory = true; break; } } - if(!flagForInventory){ + if (!flagForInventory) { // 如果概述了不合法 flag = false; } } return new RestResponse(flag); - }else{ + } else { throw new MyException("缺少必要参数"); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 5dc5c719..914f6258 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1393,6 +1393,19 @@ public class PageController { } + @GetMapping("/applicationOutForGroup") + public ModelAndView applicationOutForGroup(Integer gid,String type){ + ModelAndView mv = new ModelAndView(); + mv.addObject("type",type); + if("one".equals(type)) { + mv.addObject("gid",gid); + }else if("more".equals(type)){ + } + mv.setViewName("pages/group/applicationOutForGroup"); + return mv; + } + + @GetMapping("/StockTakingReview") public ModelAndView StockTakingReview(Integer id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java index 5565bac8..e453120b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java @@ -46,6 +46,7 @@ public class GroupServiceImpl implements GroupService { /** * 用于查找所有套餐 + * * @return */ @Override @@ -55,6 +56,7 @@ public class GroupServiceImpl implements GroupService { /** * 根据套餐id查询对应套餐 + * * @param id 套餐id * @return */ @@ -65,6 +67,7 @@ public class GroupServiceImpl implements GroupService { /** * 根据条件查询对应套餐 + * * @param map 查询条件 * @return */ @@ -77,6 +80,7 @@ public class GroupServiceImpl implements GroupService { /** * 根据条件查询对应套餐(按group分组) + * * @param map 查询条件 * @return */ @@ -86,14 +90,14 @@ public class GroupServiceImpl implements GroupService { List allGroupOnly = groupMapper.findGroupOnlyByCondition(map); // 用于查询当前套餐中的物料 - Map paramForGroup = new HashMap<>(); + Map paramForGroup = new HashMap<>(); // 最终结果 List list = new ArrayList<>(); for (int i = 0; i < allGroupOnly.size(); i++) { // 获取套餐详情 Group group = allGroupOnly.get(i); - paramForGroup.put("gid",group.getId()); + paramForGroup.put("gid", group.getId()); // 获取当前套餐对应的详情 List groupByCondition = groupMapper.findGroupByCondition(paramForGroup); @@ -105,7 +109,7 @@ public class GroupServiceImpl implements GroupService { Integer quantity = 0; // 用于存储物料名称与物料id - Map materialSimple = new HashMap<>(); + Map materialSimple = new HashMap<>(); for (GroupInfo groupInfo : groupByCondition) { materialSimple.put(groupInfo.getMname(), groupInfo.getMid()); quantity += groupInfo.getQuantity(); @@ -116,8 +120,10 @@ public class GroupServiceImpl implements GroupService { } return list; } + /** * 获取当前套餐数量 + * * @return */ @Override @@ -127,13 +133,14 @@ public class GroupServiceImpl implements GroupService { /** * 根据条件查询对应套餐数目 + * * @param map 查询条件 * @return */ @Override public Integer findGroupCountByCondition(Map map) { Integer count = groupMapper.findGroupCountByCondition(map); - if(count == null){ + if (count == null) { count = 0; } return count; @@ -141,25 +148,26 @@ public class GroupServiceImpl implements GroupService { /** * 添加一条套餐 + * * @param map 具体数据 * @return */ @Transactional(rollbackFor = Exception.class) @Override public Integer addGroup(Map map) { - Map insertForGroup = new HashMap<>(); + Map insertForGroup = new HashMap<>(); // 设置当前时间 - insertForGroup.put("createTime",System.currentTimeMillis()); + insertForGroup.put("createTime", System.currentTimeMillis()); // 获取当前套餐数量 Integer groupCount = groupMapper.findAllGroupOnlyCount(new HashMap<>()); - if(groupCount == null){ + if (groupCount == null) { groupCount = 0; } // 构造套餐编码 String code = createCode(groupCount); - insertForGroup.put("code",code); - insertForGroup.put("state",1); + insertForGroup.put("code", code); + insertForGroup.put("state", 1); // 插入到数据库 groupMapper.addGroup(insertForGroup); @@ -174,9 +182,9 @@ public class GroupServiceImpl implements GroupService { // 用于添加套餐中的物料信息 - Map materialForGroupMap = new HashMap<>(); + Map materialForGroupMap = new HashMap<>(); - materialForGroupMap.put("gid",gid); + materialForGroupMap.put("gid", gid); Integer result = 0; for (int i = 0; i < mids.size(); i++) { @@ -185,11 +193,11 @@ public class GroupServiceImpl implements GroupService { // 获取套餐中当前物料对应的数量 Object quantity = quantitys.get(i); - materialForGroupMap.put("mid",mid); - materialForGroupMap.put("quantity",quantity); + materialForGroupMap.put("mid", mid); + materialForGroupMap.put("quantity", quantity); // 添加 - result += groupMapper.addGroupForMaterial(materialForGroupMap); + result += groupMapper.addGroupForMaterial(materialForGroupMap); } return result; @@ -197,6 +205,7 @@ public class GroupServiceImpl implements GroupService { /** * 通过编码获取对应的套餐 + * * @param code 套餐编码 * @return */ @@ -208,6 +217,7 @@ public class GroupServiceImpl implements GroupService { /** * 给套餐添加物料信息 + * * @param map 待添加信息 * @return */ @@ -223,9 +233,9 @@ public class GroupServiceImpl implements GroupService { // 用于添加套餐中的物料信息 - Map materialForGroupMap = new HashMap<>(); + Map materialForGroupMap = new HashMap<>(); - materialForGroupMap.put("gid",gid); + materialForGroupMap.put("gid", gid); Integer result = 0; for (int i = 0; i < mids.size(); i++) { @@ -234,8 +244,8 @@ public class GroupServiceImpl implements GroupService { // 获取套餐中当前物料对应的数量 Object quantity = quantitys.get(i); - materialForGroupMap.put("mid",mid); - materialForGroupMap.put("quantity",quantity); + materialForGroupMap.put("mid", mid); + materialForGroupMap.put("quantity", quantity); // 添加 result += groupMapper.addGroupForMaterial(materialForGroupMap); @@ -246,6 +256,7 @@ public class GroupServiceImpl implements GroupService { /** * 添加一条套餐 + * * @param groupInfo 具体数据 * @return */ @@ -257,6 +268,7 @@ public class GroupServiceImpl implements GroupService { /** * 根据主键删除一条套餐记录 + * * @param id 待删除套餐主键 * @return */ @@ -264,8 +276,8 @@ public class GroupServiceImpl implements GroupService { @Override public Integer delGroupById(Integer id) { - Map param = new HashMap<>(); - param.put("gid",id); + Map param = new HashMap<>(); + param.put("gid", id); List groupByCondition = groupMapper.findGroupByCondition(param); List ids = new ArrayList<>(); @@ -280,6 +292,7 @@ public class GroupServiceImpl implements GroupService { /** * 根据主键批量删除套餐记录 + * * @param ids 主键列表 * @return */ @@ -290,6 +303,7 @@ public class GroupServiceImpl implements GroupService { /** * 修改套餐中对应物料信息 + * * @param map 修改数据及条件 * @return */ @@ -299,10 +313,10 @@ public class GroupServiceImpl implements GroupService { Integer id = ObjectFormatUtil.toInteger(map.get("id")); // 获取当前要修改的物料明细数量 Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity")); - if(Integer.compare(0,quantity) == 0){ + if (Integer.compare(0, quantity) == 0) { // 如果要修改的数量为0则删除该明细 return groupMapper.delMaterialForGroupById(id); - }else { + } else { // 根据id获取当前套餐明细 GroupInfo groupById = groupMapper.findGroupById(id); groupById.setQuantity(quantity); @@ -313,17 +327,18 @@ public class GroupServiceImpl implements GroupService { /** * 通过物料id与套餐id查询对应套餐明细 + * * @param mid 物料id * @param gid 套餐id * @return 套餐明细 */ @Override public GroupInfo findGroupInfoByMidAndGid(Integer mid, Integer gid) { - Map map = new HashMap<>(); - map.put("mid",mid); - map.put("gid",gid); + Map map = new HashMap<>(); + map.put("mid", mid); + map.put("gid", gid); List groupByCondition = groupMapper.findGroupByCondition(map); - if(groupByCondition.size() > 0){ + if (groupByCondition.size() > 0) { return groupByCondition.get(0); } return null; @@ -331,6 +346,7 @@ public class GroupServiceImpl implements GroupService { /** * 根据主键删除一条套餐中的物料明细 + * * @param id 待删除主键 * @return */ @@ -341,6 +357,7 @@ public class GroupServiceImpl implements GroupService { /** * 根据主键批量删除套餐中的物料明细 + * * @param ids 待删除主键 * @return */ @@ -351,6 +368,7 @@ public class GroupServiceImpl implements GroupService { /** * 根据条件修改套餐信息 + * * @param map 修改条件 * @return */ @@ -361,8 +379,8 @@ public class GroupServiceImpl implements GroupService { // 根据主键获取对应套餐 Group group = groupMapper.findGroupOnlyById(id); Integer state = 2; - if(map.containsKey("state")){ - state = ObjectFormatUtil.toInteger(map.get("state")); + if (map.containsKey("state")) { + state = ObjectFormatUtil.toInteger(map.get("state")); } group.setState(state); return groupMapper.updateGroupOnly(group); @@ -371,6 +389,7 @@ public class GroupServiceImpl implements GroupService { /** * 根据条件修改套餐信息 + * * @param map 修改条件 * @return */ @@ -381,6 +400,7 @@ public class GroupServiceImpl implements GroupService { /** * 根据条件获取套餐 + * * @param map 查询条件 * @return */ @@ -392,6 +412,7 @@ public class GroupServiceImpl implements GroupService { /** * 用于构造套餐树 + * * @param gname * @return */ @@ -455,13 +476,14 @@ public class GroupServiceImpl implements GroupService { } list.addAll((Collection) result); } - return list; + return list; } /** * 插入一条出库记录 - * @param map 具体数据 + * + * @param map 具体数据 * @param userToken 出库申请人 * @return */ @@ -469,13 +491,20 @@ public class GroupServiceImpl implements GroupService { @Transactional(rollbackFor = Exception.class) public Integer insertApplicationOutRecord(Map map, UserByPort userToken) { // 用于存储出库数据 - Map paramForOut = new HashMap<>(); - paramForOut.put("departmenthead",map.get("departmenthead")); - paramForOut.put("applicantId",userToken.getId()); + Map paramForOut = new HashMap<>(); + paramForOut.put("departmenthead", map.get("departmenthead")); + paramForOut.put("applicantId", userToken.getId()); + // 获取当前提交数 + List params = (List) map.get("params"); + // 用于存储申请数 + Integer result = 0; + Object parentId = null; + // 获取当前要出库的套餐数量 Integer quantityForGroup = ObjectFormatUtil.toInteger(map.get("quantity")); // 获取要出库的套餐 Integer gid = ObjectFormatUtil.toInteger(map.get("gid")); + // 获取要出库套餐的具体信息 List groupInfoByGid = groupMapper.findGroupInfoByGid(gid); // 用于统计出库物料总数 @@ -492,28 +521,73 @@ public class GroupServiceImpl implements GroupService { quantityForTotal += quantityForGroup * groupInfo.getQuantity(); priceForTotal += inventory.get(0).getPrice() * 100 * quantityForGroup; } - paramForOut.put("quantity",quantityForTotal); - paramForOut.put("price",priceForTotal); - paramForOut.put("applicantTime",System.currentTimeMillis()); + paramForOut.put("quantity", quantityForTotal); + paramForOut.put("price", priceForTotal); + paramForOut.put("applicantTime", System.currentTimeMillis()); paramForOut.put("istransfer", 2); paramForOut.put("state", "待部门负责人审核"); paramForOut.put("applyRemark", map.get("applyRemark")); Administration company = LinkInterfaceUtil.getCompany(userToken.getMaindeparment(), userToken); // 构造出库订单编码 - String code = createOutCode( "outOrderNumber", company.getName()); + String code = createOutCode("outOrderNumber", company.getName()); paramForOut.put("code", code); paramForOut.put("pass", 3); - Integer integer = depositoryRecordMapper.insertApplicationOutRecord(paramForOut); - Object parentId = paramForOut.get("id"); + depositoryRecordMapper.insertApplicationOutRecord(paramForOut); + parentId = paramForOut.get("id"); + + result += insertApplicationOutMinRecord(userToken, code, parentId, gid, quantityForGroup); + + if (params.size() > 0) { + // 如果提交的不是单个 + + // 循环其他 + for (String temp : params) { + // 获取当前要出库的套餐数量 + quantityForGroup = ObjectFormatUtil.toInteger(map.get("quantity" + temp)); + // 获取要出库的套餐 + gid = ObjectFormatUtil.toInteger(map.get("gid" + temp)); + // 获取当前要出库套餐的具体信息 + groupInfoByGid = groupMapper.findGroupInfoByGid(gid); + for (GroupInfo groupInfo : groupInfoByGid) { + // 获取具体信息 + // 获取当前物料库存信息 + Map paramForMid = new HashMap<>(); + paramForMid.put("mid", groupInfo.getMid()); + List inventory = materialMapper.findInventory(paramForMid); + quantityForTotal += quantityForGroup * groupInfo.getQuantity(); + priceForTotal += inventory.get(0).getPrice() * 100 * quantityForGroup; + } + result += insertApplicationOutMinRecord(userToken, code, parentId, gid, quantityForGroup); + } + + } + map.put("id", parentId); + return result; + } + + /** + * 用于插入子出库订单 + * + * @param userToken 申请人 + * @param code 出库单号 + * @param parentId 主单号 + * @param gid 套餐id + * @param quantityForGroup 出库的套餐数 + * @return + */ + @Transactional(rollbackFor = Exception.class) + public Integer insertApplicationOutMinRecord(UserByPort userToken, String code, Object parentId, Integer gid, Integer quantityForGroup) { // 用于存储申请数 Integer result = 0; // 获取当前部门仓库 List depositoryByAdminorg = depositoryMapper.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); + // 获取要出库套餐的具体信息 + List groupInfoByGid = groupMapper.findGroupInfoByGid(gid); for (GroupInfo groupInfo : groupInfoByGid) { // 用于存储出库数据 - Map paramForOutMin = new HashMap<>(); + Map paramForOutMin = new HashMap<>(); paramForOutMin.put("parentId", parentId); // 套餐中的具体信息 // 实际要出库的物料库存数量 @@ -540,22 +614,23 @@ public class GroupServiceImpl implements GroupService { if (did != -1) { // 如果有正确的仓库 paramForOutMin.put("depositoryId", did); - paramForOutMin.put("mid",mid); + paramForOutMin.put("mid", mid); paramForOutMin.put("trueOut", 0); paramForOutMin.put("quantity", quantity); - paramForOutMin.put("code", map.get("code")); + paramForOutMin.put("code", code); paramForOutMin.put("placeId", 0); result += depositoryRecordMapper.insertApplicationOutRecordMin(paramForOutMin); - }else{ + } else { throw new MyException(groupInfo.getMname() + ",库存不足"); } } - map.put("id",parentId); + return result; } /** * 根据套餐编号获取套餐具体信息 + * * @param gid 待查讯套餐编号 * @return */ @@ -571,10 +646,11 @@ public class GroupServiceImpl implements GroupService { List groupIdList; - public Task(List groupIdList){ + public Task(List groupIdList) { this.groupIdList = groupIdList; } + @Override public Object call() throws Exception { /** @@ -615,19 +691,19 @@ public class GroupServiceImpl implements GroupService { } } - class TaskForGroupInfo implements Callable{ + class TaskForGroupInfo implements Callable { Group group; - TaskForGroupInfo(Group group){ + + TaskForGroupInfo(Group group) { this.group = group; } @Override - public Object call() throws Exception - { + public Object call() throws Exception { // 用于获取当前套餐的具体信息 - Map paramForGroup = new HashMap<>(); - paramForGroup.put("gid",group.getId()); + Map paramForGroup = new HashMap<>(); + paramForGroup.put("gid", group.getId()); // 获取当前套餐的具体信息 List groupByCondition = groupMapper.findGroupByCondition(paramForGroup); // 定义子类结果集 @@ -642,10 +718,10 @@ public class GroupServiceImpl implements GroupService { } - /** * 构造树形组件数据模板 - * @param g 套餐 + * + * @param g 套餐 * @param children 子类 * @return */ @@ -664,6 +740,7 @@ public class GroupServiceImpl implements GroupService { /** * 构造树形组件的子组件模板 + * * @param g 套餐详细信息 * @return */ @@ -679,25 +756,24 @@ public class GroupServiceImpl implements GroupService { } - /** - * * 用于创建套餐编码 + * * @param num 第几个套餐 * @return */ - public String createCode(Integer num){ - String code = "g-"+String.format("%05d", num + 1); + public String createCode(Integer num) { + String code = String.format("%04d", num + 1); return code; } - /** * 生成出库单号 + * * @return */ - private String createOutCode( String key, String mainDeparmentName) { + private String createOutCode(String key, String mainDeparmentName) { RLock lock = redissonClient.getLock(key); // 入库单号（公司简称+仓库简称+年月日+数字（位数设置>=9）） String code = "GK"; @@ -712,7 +788,8 @@ public class GroupServiceImpl implements GroupService { redisTemplate.boundValueOps(key).set(String.valueOf(newNumber), DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS); lock.unlock(); orderNumber = String.format("%09d", ObjectFormatUtil.toInteger(orderNumber)); - mainDeparmentName = WordUtil.getPinYinHeadChar(mainDeparmentName);code = code + mainDeparmentName + nowTime + orderNumber; + mainDeparmentName = WordUtil.getPinYinHeadChar(mainDeparmentName); + code = code + mainDeparmentName + nowTime + orderNumber; return code; } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index 1648aaf4..db722102 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java @@ -1367,11 +1367,11 @@ public class QyWxOperationService { ApprovalTemplate approvalTemplate = new ApprovalTemplate(); // 获取申请人的userId -// String workwechat = userToken.getWorkwechat(); -// if(workwechat == null || "".equals(workwechat)){ -// workwechat = userToken.getWechat(); -// } - String workwechat = "PangFuZhen"; + String workwechat = userToken.getWorkwechat(); + if(workwechat == null || "".equals(workwechat)){ + workwechat = userToken.getWechat(); + } +// String workwechat = "PangFuZhen"; // 设置申请人 approvalTemplate.setCreator_userid(workwechat); @@ -1685,7 +1685,6 @@ public class QyWxOperationService { for (String value : split) { userIdList.add(value); } - approval_template_approver.setUserid(userIdList); approval_template_approver_list.add(approval_template_approver); approvalTemplate.setApprover(approval_template_approver_list); diff --git a/src/main/resources/templates/pages/application/application-out.html b/src/main/resources/templates/pages/application/application-out.html index 5d86608f..bad78484 100644 --- a/src/main/resources/templates/pages/application/application-out.html +++ b/src/main/resources/templates/pages/application/application-out.html @@ -1377,8 +1377,8 @@ var flag = res.data; if (!flag) { // 如果当前数目不合适 - layer.msg("当前物料数量不足", {icon: 0, time: 500}, function () { - $("#quantity" + id).val(""); + layer.msg("当前套餐中有物料库存数量不足", {icon: 0, time: 500}, function () { + $("#quantityForGroup" + id).val(""); }); } diff --git a/src/main/resources/templates/pages/application/application-out_black2.html b/src/main/resources/templates/pages/application/application-out_black2.html deleted file mode 100644 index e269d373..00000000 --- a/src/main/resources/templates/pages/application/application-out_black2.html +++ /dev/null @@ -1,831 +0,0 @@ - - - - - 分步表单 - - - - - - - - - -
-
-
- - -
- -
-
- - - - - - \ No newline at end of file diff --git a/src/main/resources/templates/pages/group/applicationOutForGroup.html b/src/main/resources/templates/pages/group/applicationOutForGroup.html new file mode 100644 index 00000000..d74a48d1 --- /dev/null +++ b/src/main/resources/templates/pages/group/applicationOutForGroup.html @@ -0,0 +1,285 @@ + + + + + 分步表单 + + + + + + + + + + +
+
+
+ +
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/pages/group/group-out.html b/src/main/resources/templates/pages/group/group-out.html index 28c15141..7af3635f 100644 --- a/src/main/resources/templates/pages/group/group-out.html +++ b/src/main/resources/templates/pages/group/group-out.html @@ -87,6 +87,9 @@ 彻底删除 + @@ -137,7 +140,8 @@ {field: 'quantity', width: 200, title: '数量'}, {field: 'createTime', width: 200, title: '创建时间'}, {field: 'state', title: '状态', minWidth: 80, templet: '#switchTpl'}, - {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"} + {title: '出库', minWidth: 200, toolbar: '#currentTableBarForOut', align: "center"}, + {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"}, ] @@ -307,6 +311,9 @@ }) }) } + else if (obj.event === 'applicationOut'){ + alert(1) + } }); diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index 09e5c2df..16bf0d52 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -310,7 +310,7 @@ content: '/ScanBarOrQrCodeOut_selectMaterial?pid=' + place.id+'&mcode='+mcode+'&depositoryId='+place.did, end: function () { let flagForSelect = layui.$("#flagForSelect").val(); - if(flagForSelect){ + if(flagForSelect === 'true'){ var param = {}; param.id = id; param.placeId = place.id; @@ -397,7 +397,7 @@ content: '/ScanBarOrQrCodeOut_selectMaterial?pid=' + 0+'&mcode='+mcode+'&depositoryId='+depository.id, end: function () { let flagForSelect = layui.$("#flagForSelect").val(); - if(flagForSelect){ + if(flagForSelect === 'true'){ var param = {}; param.id = id; param.qrCode = qrCode; diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html index 8a6da2dc..aa4b072f 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html @@ -39,7 +39,7 @@ icon:0, time:500 },function () { - + $("#flagForSelect",window.parent.document).val(false); }) }else{ $("#flagForSelect",window.parent.document).val(true); diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java index ddb16cf3..0d560114 100644 --- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java +++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java @@ -1,10 +1,17 @@ package com.dreamchaser.depository_manage; +import com.dreamchaser.depository_manage.entity.Depository; +import com.dreamchaser.depository_manage.entity.UserByPort; +import com.dreamchaser.depository_manage.service.DepositoryService; +import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import java.util.List; + /** * 专用于测试琐碎实例 @@ -12,9 +19,13 @@ import org.springframework.test.context.junit4.SpringRunner; @SpringBootTest @RunWith(SpringRunner.class) public class TestForOther { + + + @Autowired + DepositoryService depositoryService; + @Test public void Test(){ - String code = "wms-g-0001"; - System.out.println(code.contains("wms-g-")); + } } diff --git a/target/classes/templates/pages/application/application-out.html b/target/classes/templates/pages/application/application-out.html index 5d86608f..bad78484 100644 --- a/target/classes/templates/pages/application/application-out.html +++ b/target/classes/templates/pages/application/application-out.html @@ -1377,8 +1377,8 @@ var flag = res.data; if (!flag) { // 如果当前数目不合适 - layer.msg("当前物料数量不足", {icon: 0, time: 500}, function () { - $("#quantity" + id).val(""); + layer.msg("当前套餐中有物料库存数量不足", {icon: 0, time: 500}, function () { + $("#quantityForGroup" + id).val(""); }); } diff --git a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index 09e5c2df..16bf0d52 100644 --- a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -310,7 +310,7 @@ content: '/ScanBarOrQrCodeOut_selectMaterial?pid=' + place.id+'&mcode='+mcode+'&depositoryId='+place.did, end: function () { let flagForSelect = layui.$("#flagForSelect").val(); - if(flagForSelect){ + if(flagForSelect === 'true'){ var param = {}; param.id = id; param.placeId = place.id; @@ -397,7 +397,7 @@ content: '/ScanBarOrQrCodeOut_selectMaterial?pid=' + 0+'&mcode='+mcode+'&depositoryId='+depository.id, end: function () { let flagForSelect = layui.$("#flagForSelect").val(); - if(flagForSelect){ + if(flagForSelect === 'true'){ var param = {}; param.id = id; param.qrCode = qrCode; diff --git a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html index 8a6da2dc..aa4b072f 100644 --- a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html +++ b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html @@ -39,7 +39,7 @@ icon:0, time:500 },function () { - + $("#flagForSelect",window.parent.document).val(false); }) }else{ $("#flagForSelect",window.parent.document).val(true);