diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index e5ccf596..b5c268e1 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -8,20 +8,19 @@ import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.pojo.*; import com.dreamchaser.depository_manage.security.bean.UserToken; -import com.dreamchaser.depository_manage.service.DepositoryService; -import com.dreamchaser.depository_manage.service.MaterialService; -import com.dreamchaser.depository_manage.service.PlaceService; -import com.dreamchaser.depository_manage.service.RoleService; +import com.dreamchaser.depository_manage.service.*; import com.dreamchaser.depository_manage.utils.CrudUtil; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import com.sun.mail.imap.protocol.ID; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -46,6 +45,12 @@ public class MaterialController { @Autowired private RedisTemplate redisTemplate; + @Autowired + private RedisTemplate redisTemplateForString; + + @Autowired + private MaterialTypeService materialTypeService; + /** * 根据物料进行查询 * @@ -192,7 +197,7 @@ public class MaterialController { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); Integer maindeparment = userToken.getMaindeparment(); List list = new ArrayList<>(); - if ("1".equals(type)) { + /*if ("1".equals(type)) { list = materialService.InitTreeMenus(mname); } else if ("2".equals(type)) { list = materialService.InitTreeMenus(mname, String.valueOf(maindeparment)); @@ -201,11 +206,20 @@ public class MaterialController { String placeId = (String) map.get("placeId"); list = materialService.InitTreeMenus(mname, depositoryId, placeId); }else if("4".equals(type)){ - list = materialService.InitTreeMenus_Test(mname); - } + list = materialService.InitTreeMenus_Test(); + }*/ + list = materialService.InitTreeMenus_Test(); return new RestResponse(list); } + // 每天凌晨0点执行一次 + @Scheduled(cron = "0 0 0 * * ?") + private void getTransData() throws Exception { + materialService.InitTreeMenus_Test(); + // bankDataService.insertTD(); + } + + /** * 根据id获取物料 * @@ -684,8 +698,7 @@ public class MaterialController { Map param = new HashMap<>(); Object pid = map.get("placeId"); String placeId = "0"; - if(pid != null) - { + if (pid != null) { placeId = pid.toString(); } @@ -712,7 +725,7 @@ public class MaterialController { if (placeAndMaterialByMidAndPid == null) { // 如果当前物料不在该库位 flag = false; - }else{ + } else { mp.setQuantity(placeAndMaterialByMidAndPid.getQuantity()); } } else { @@ -720,7 +733,7 @@ public class MaterialController { if (placeAndMaterialByMidAndPid == null) { // 如果当前物料不在该库位 flag = false; - }else{ + } else { mp.setQuantity(placeAndMaterialByMidAndPid.getQuantity()); } } @@ -1063,9 +1076,9 @@ public class MaterialController { String barCode = (String) map.get("qrCode"); Map result = new HashMap<>(); MaterialP material = null; - Object pid = map.get("placeId"); + Object pid = map.get("placeId"); String placeId = "0"; - if(pid != null){ + if (pid != null) { placeId = pid.toString(); } // 用于存储没有对应关系的条形码 @@ -1227,7 +1240,7 @@ public class MaterialController { // 获取当前部门仓库 Map param = new HashMap<>(); String code = map.get("code").toString(); - String depositoryId = map.get("depositoryId").toString(); + String depositoryId = map.get("depositoryId").toString(); String placeId = map.get("placeId").toString(); if ("".equals(code)) { return new RestResponse(null, 1, 200); @@ -1276,39 +1289,40 @@ public class MaterialController { /** * 用于查询当前扫描的二维码为仓库还是物料 + * * @param map * @param request * @return */ @PostMapping("/qywxScanCodeOut") - public RestResponse qywxScanCodeOut(@RequestBody Map map,HttpServletRequest request){ + public RestResponse qywxScanCodeOut(@RequestBody Map map, HttpServletRequest request) { String qrCode = (String) map.get("qrCode"); String materialCode = materialService.findMaterialCodeByQrCode(qrCode); - Map result = new HashMap<>(); + Map result = new HashMap<>(); // 0为非法码，1为物料，2为库位，3为仓库 Integer flag = 0; - if(materialCode != null){ + if (materialCode != null) { // 如果当前不为空,则扫描的为物料二维码 flag = 1; Material materialByCode = materialService.findMaterialByCode(materialCode); - result.put("material",materialByCode); - }else{ + result.put("material", materialByCode); + } else { // 如果为空，则扫描的为条形码 MaterialAndBarCode materialByBarCode = materialService.findMaterialByBarCode(qrCode); - if(materialByBarCode != null){ + if (materialByBarCode != null) { // 如果不为空，则扫描的为物料条形码 Material material = materialService.findMaterialById(materialByBarCode.getMid()); flag = 1; - result.put("material",material); - }else{ + result.put("material", material); + } else { // 如果为空，则扫描的可能为库位码 PidOrDidAndCode locationByQrCode = placeService.findLocationByQrCode(qrCode); - if(locationByQrCode != null){ + if (locationByQrCode != null) { // 如果不为空，则是库位码 // 1为库位2为仓库 Integer locationFlag = locationByQrCode.getFlag(); - if(Integer.compare(locationFlag,1) == 0){ + if (Integer.compare(locationFlag, 1) == 0) { // 如果是库位 Place placeById = placeService.findPlaceById(ObjectFormatUtil.toInteger(locationByQrCode.getPid())); @@ -1321,18 +1335,50 @@ public class MaterialController { mcodeList.add(materialById.getCode()); } pp.setMcodeList(mcodeList); - result.put("place",pp); + result.put("place", pp); flag = 2; - }else{ + } else { // 如果是仓库 Depository depository = depositoryService.findDepositoryRecordById(ObjectFormatUtil.toInteger(locationByQrCode.getDepositoryId())); - result.put("depository",depository); + result.put("depository", depository); flag = 3; } } } } - result.put("flag",flag); + result.put("flag", flag); return new RestResponse(result); } + + + /** + * 用于再次获取新数据 + * + * @param map + * @return + */ + @PostMapping("/getNewTreeForMtId") + public RestResponse getNewTreeForMtId(@RequestBody Map map, HttpServletRequest request) { + String mname = (String) map.get("mname"); + String type = (String) map.get("type"); + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); + Integer maindeparment = userToken.getMaindeparment(); + Object mtId = map.get("mtId"); + List list = new ArrayList<>(); + if (mtId != null) { + if("2".equals(type)){ + map.put("adminorg",String.valueOf(maindeparment)); + }else if("3".equals(type)){ + String depositoryId = (String) map.get("depositoryId"); + String placeId = (String) map.get("placeId"); + map.put("depositoryId", depositoryId); + map.put("placeId", placeId); + } + list = materialService.AddInitTreeMenus(map); + + } else { + throw new MyException("缺少必要参数"); + } + return new RestResponse(list); + } } 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 43f8d2d2..8a0159df 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -75,24 +75,22 @@ public class PageController { private PlaceService placeService; @Autowired - private RedisTemplate redisTemplate; + private RedisTemplate redisTemplate; @Autowired - private RedisTemplate redisTemplateForHash; + private RedisTemplate redisTemplateForHash; @Autowired private StockTakingService stockTakingService; - - - public static JSONObject Captcha(HttpServletRequest request){ + public static JSONObject Captcha(HttpServletRequest request) { UserByPort userByPort = (UserByPort) request.getAttribute("userToken"); String url = PortConfig.external_url_6666 + "/base/captcha"; JSONObject param = new JSONObject(); String post = null; try { - post = HttpUtils.send(url, param, HTTP.UTF_8,userByPort); + post = HttpUtils.send(url, param, HTTP.UTF_8, userByPort); } catch (IOException e) { e.printStackTrace(); } @@ -103,7 +101,7 @@ public class PageController { @GetMapping("/") - public ModelAndView Init(HttpServletRequest request){ + public ModelAndView Init(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("index"); UserByPort userToken = (UserByPort) request.getAttribute("userToken"); @@ -112,40 +110,51 @@ public class PageController { } - /** * 用于正常登录 + * * @param request * @return */ @GetMapping("/login") public ModelAndView login(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); - JSONObject captcha = Captcha(request); - String picPath = (String) captcha.get("picPath"); - String captchaid = (String) captcha.get("captchaid"); - mv.addObject("picPath", picPath); - mv.addObject("captchaid", captchaid); - mv.addObject("userWxId",""); - mv.setViewName("pages/user/login"); - return mv; + JSONObject captcha = Captcha(request); + String picPath = (String) captcha.get("picPath"); + String captchaid = (String) captcha.get("captchaid"); + mv.addObject("picPath", picPath); + mv.addObject("captchaid", captchaid); + mv.addObject("userWxId", ""); + mv.setViewName("pages/user/login"); + return mv; } + @GetMapping("/getMaterialAll") + public ModelAndView getMaterialAll(@RequestParam Map map) { + ModelAndView mv = new ModelAndView(); + mv.addObject("mname", map.get("mname")); + mv.addObject("type", map.get("type")); + mv.addObject("clickObj", map.get("clickObj")); + Object depositoryId = map.get("depositoryId"); + if (depositoryId != null) { + mv.addObject("depositoryId", depositoryId); + } else { + mv.addObject("depositoryId", -1); + } + Object placeId = map.get("placeId"); + if (placeId != null) { + mv.addObject("placeId", placeId); + } else { - @GetMapping("/getMaterialAll") - public ModelAndView getMaterialAll(String mname,String type,String clickObj){ - ModelAndView mv = new ModelAndView(); - mv.addObject("mname",mname); - mv.addObject("type",type); - mv.addObject("clickObj",clickObj); + mv.addObject("placeId", -1); + } mv.setViewName("pages/material/selectMaterialByApproval"); return mv; } - @GetMapping("/index") public ModelAndView index(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); @@ -175,14 +184,14 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userToken); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userToken); } catch (IOException e) { e.printStackTrace(); } JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); JSONArray powerid = (JSONArray) data.get("powerid"); - if(powerid == null){ + if (powerid == null) { powerid = new JSONArray(); } List stringList = JSONObject.parseArray(powerid.toJSONString(), String.class); @@ -311,7 +320,7 @@ public class PageController { map.put("end", days.get(0)); // Integer warehouseRecord = depositoryRecordService.findWarehouseRecord(parm); Integer warehouseRecord = 0; - Map param = new HashMap<>(); + Map param = new HashMap<>(); Integer applicationOut = depositoryRecordService.findApplicationOutRecordPCountByCondition(param); Integer applicationIn = depositoryRecordService.findApplicationInRecordPCountByCondition(param); warehouseRecord = applicationIn + applicationOut; @@ -338,9 +347,9 @@ public class PageController { mv.setViewName("pages/warehouse/depository-out"); Map map = new HashMap<>(); map.put("parentId", 0); - List depositoryAll = depositoryService.findDepositoryRecordPByCondition(map,userToken); + List depositoryAll = depositoryService.findDepositoryRecordPByCondition(map, userToken); Integer role = userToken.getIsadmin(); - if(role == null){ + if (role == null) { role = 1; } if (role == 4) { @@ -359,7 +368,7 @@ public class PageController { mv.setViewName("pages/material/material-out"); UserByPort userToken = (UserByPort) request.getAttribute("userToken"); Integer isadmin = userToken.getIsadmin(); - if(isadmin == null){ + if (isadmin == null) { isadmin = 1; } if (isadmin == 4) { @@ -379,17 +388,17 @@ public class PageController { // 物料类型树形菜单页面 @GetMapping("/selectType") - public String selectType(){ + public String selectType() { return "pages/material/selectType"; } // 仓库树形菜单页面 @GetMapping("/selectDepository") - public ModelAndView selectDepository(Integer type,HttpServletRequest request){ + public ModelAndView selectDepository(Integer type, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); UserByPort userToken = (UserByPort) request.getAttribute("userToken"); - if(type == 1) { + if (type == 1) { Integer maindeparment = userToken.getMaindeparment(); mv.addObject("adminorg", maindeparment); } @@ -400,10 +409,10 @@ public class PageController { // 专用于卡片仓库树形菜单页面 @GetMapping("/selectDepositoryByCard") - public ModelAndView selectDepositoryByCard(Integer type,String clickObj,HttpServletRequest request){ + public ModelAndView selectDepositoryByCard(Integer type, String clickObj, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); UserByPort userToken = (UserByPort) request.getAttribute("userToken"); - if(type == 1) { + if (type == 1) { Integer maindeparment = userToken.getMaindeparment(); mv.addObject("adminorg", maindeparment); mv.addObject("clickObj", clickObj); @@ -414,17 +423,17 @@ public class PageController { // 物料树形菜单页面 @GetMapping("/selectMaterial") - public ModelAndView selectMaterial(String mname,String type){ + public ModelAndView selectMaterial(String mname, String type) { ModelAndView mv = new ModelAndView(); - mv.addObject("mname",mname); - mv.addObject("type",type); + mv.addObject("mname", mname); + mv.addObject("type", type); mv.setViewName("pages/material/selectMaterial"); return mv; } // 负责人树形菜单页面 @GetMapping("/selectManager") - public ModelAndView selectManager(){ + public ModelAndView selectManager() { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/post/selectManager"); return mv; @@ -432,43 +441,42 @@ public class PageController { // 专用于卡片物料树形菜单页面 @GetMapping("/selectMaterialByCard") - public ModelAndView selectMaterialByCard(String mname,String type,String clickObj){ + public ModelAndView selectMaterialByCard(String mname, String type, String clickObj) { ModelAndView mv = new ModelAndView(); - mv.addObject("mname",mname); - mv.addObject("type",type); - mv.addObject("clickObj",clickObj); + mv.addObject("mname", mname); + mv.addObject("type", type); + mv.addObject("clickObj", clickObj); mv.setViewName("pages/material/selectMaterialByCard"); return mv; } // 专用于库存盘点卡片物料树形菜单页面 @GetMapping("/selectMaterialByCardForTaking") - public ModelAndView selectMaterialByCardForTaking(@RequestParam Map map){ + public ModelAndView selectMaterialByCardForTaking(@RequestParam Map map) { ModelAndView mv = new ModelAndView(); - mv.addObject("mname",map.get("mname")); - mv.addObject("type",map.get("type")); - mv.addObject("clickObj",map.get("clickObj")); - mv.addObject("placeId",map.get("placeId")); - mv.addObject("depositoryId",map.get("depositoryId")); + mv.addObject("mname", map.get("mname")); + mv.addObject("type", map.get("type")); + mv.addObject("clickObj", map.get("clickObj")); + mv.addObject("placeId", map.get("placeId")); + mv.addObject("depositoryId", map.get("depositoryId")); mv.setViewName("pages/material/selectMaterialByCardForTaking"); return mv; } - @GetMapping("material_view") - public ModelAndView material_view(Integer id,HttpServletRequest request) { + public ModelAndView material_view(Integer id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/material/material-view"); UserByPort userToken = (UserByPort) request.getAttribute("userToken"); if (id != null) { Material material = materialService.findMaterialById(id); - Map map = new HashMap<>(); - map.put("mcode",material.getCode()); + Map map = new HashMap<>(); + map.put("mcode", material.getCode()); // 获取物料与条形码的对应关系 List materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(map); mv.addObject("record", materialService.findMaterialAndTypeById(id)); - mv.addObject("barCodeList",materialByBarCodeByCondition); + mv.addObject("barCodeList", materialByBarCodeByCondition); mv.addObject("materialTypes", materialTypeService.findMaterialTypeAll()); } else { throw new MyException("缺少必要参数！"); @@ -493,7 +501,7 @@ public class PageController { map.put("parentId", 0); UserByPort userToken = (UserByPort) request.getAttribute("userToken"); Integer role = userToken.getIsadmin(); - if(role == null){ + if (role == null) { role = 1; } List materialTypeAll = materialTypeService.findMaterialTypeByCondition(map); @@ -514,32 +522,32 @@ public class PageController { } @GetMapping("/application_multi") - public ModelAndView application_multi(){ + public ModelAndView application_multi() { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/application/application_multi"); return mv; } @GetMapping("/application_in_back") - public ModelAndView applicationIn(Integer mid,Integer depositoryId){ + public ModelAndView applicationIn(Integer mid, Integer depositoryId) { ModelAndView mv = new ModelAndView(); Material materialById = new Material(); Depository depositoryRecordById = new Depository(); - if(mid != null ){ + if (mid != null) { materialById = materialService.findMaterialById(mid); } - if(depositoryId != null){ + if (depositoryId != null) { depositoryRecordById = depositoryService.findDepositoryRecordById(depositoryId); } - mv.addObject("materialById",materialById); - mv.addObject("depository",depositoryRecordById); + mv.addObject("materialById", materialById); + mv.addObject("depository", depositoryRecordById); mv.setViewName("pages/application/application-in_back"); return mv; } @GetMapping("/application_in_multi") - public ModelAndView applicationInMulti(){ + public ModelAndView applicationInMulti() { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/application/application-in_back"); return mv; @@ -553,21 +561,21 @@ public class PageController { } @GetMapping("/application_out_back") - public ModelAndView application_out_back(Integer code,String depositoryId) { + public ModelAndView application_out_back(Integer code, String depositoryId) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/application/application-out_back"); MaterialP materialById = new MaterialP(); - if(code != null) { - Map map = new HashMap<>(); + if (code != null) { + Map map = new HashMap<>(); Depository depositoryByCode = depositoryService.findDepositoryRecordById(ObjectFormatUtil.toInteger(depositoryId)); - map.put("depositoryId",depositoryByCode.getId()); - map.put("code",code); + map.put("depositoryId", depositoryByCode.getId()); + map.put("code", code); List inventory = materialService.findInventory(map); - if(inventory.size() < 1){ - mv.addObject("materialById",new Material()); - }else{ + if (inventory.size() < 1) { + mv.addObject("materialById", new Material()); + } else { materialById = inventory.get(0); - mv.addObject("materialById",materialById); + mv.addObject("materialById", materialById); } } return mv; @@ -643,6 +651,7 @@ public class PageController { /** * 入库可视化 + * * @return */ @GetMapping("chart_in_back") @@ -697,16 +706,17 @@ public class PageController { /** * 根据条件查询用户 + * * @param map * @return */ - public static List FindUserByMap(Map map,UserByPort userToken) { + public static List FindUserByMap(Map map, UserByPort userToken) { String url = PortConfig.external_url + "/staff/archiveslist"; String jsonString = JSONObject.toJSONString(map); JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userToken); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userToken); } catch (IOException e) { e.printStackTrace(); } @@ -714,7 +724,7 @@ public class PageController { JSONObject data = (JSONObject) jsonObject.get("data"); JSONArray list = (JSONArray) data.get("list"); List result = new ArrayList<>(); - if(list == null){ + if (list == null) { list = new JSONArray(); } for (int i = 0; i < list.size(); i++) { @@ -724,7 +734,7 @@ public class PageController { return result; } - public static UserByPort FindUserById(Integer id,UserByPort userToken) { + public static UserByPort FindUserById(Integer id, UserByPort userToken) { String url = PortConfig.external_url + "/staff/archivescont"; Map map = new HashMap<>(); map.put("id", id); @@ -732,7 +742,7 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userToken); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userToken); } catch (IOException e) { e.printStackTrace(); @@ -745,11 +755,11 @@ public class PageController { @GetMapping("/user_add") - public ModelAndView user_add(Integer userId,HttpServletRequest request) { + public ModelAndView user_add(Integer userId, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/user/user-add"); - UserByPort userByPort = FindUserById(userId,userToken); + UserByPort userByPort = FindUserById(userId, userToken); UserByPortP userByPortP = new UserByPortP(userByPort); mv.addObject("userByPort", userByPortP); mv.addObject("roles", roleService.findAllRole()); @@ -758,14 +768,14 @@ public class PageController { } @GetMapping("/user_role_edit") - public ModelAndView user_role_edit(Integer id,HttpServletRequest request) { + public ModelAndView user_role_edit(Integer id, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/user/user-role-edit"); RoleAndDepository roleAndDepositoryById = roleService.findRoleAndDepositoryById(id); UserByPortP userByPortP = null; if (roleAndDepositoryById != null) { - UserByPort userByPort = FindUserById(roleAndDepositoryById.getUserId(),userToken); + UserByPort userByPort = FindUserById(roleAndDepositoryById.getUserId(), userToken); userByPortP = new UserByPortP(userByPort); userByPortP.setRolename(roleAndDepositoryById.getRoleName()); userByPortP.setDepositoryName(roleAndDepositoryById.getDepositoryName()); @@ -773,24 +783,24 @@ public class PageController { mv.addObject("userByPort", userByPortP); mv.addObject("roleId", roleAndDepositoryById.getId()); mv.addObject("roles", roleService.findAllRole()); - mv.addObject("depositoryId",roleAndDepositoryById.getDepositoryId()); + mv.addObject("depositoryId", roleAndDepositoryById.getDepositoryId()); mv.addObject("depositories", depositoryService.findDepositoryAll()); return mv; } @GetMapping("/post_role_edit") - public ModelAndView post_role_edit(Integer id,Integer depositoryId,HttpServletRequest request) { - UserByPort userToken= (UserByPort) request.getAttribute("userToken"); + public ModelAndView post_role_edit(Integer id, Integer depositoryId, HttpServletRequest request) { + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/post/postRole_edit"); - Map userParam = new HashMap<>(); - userParam.put("position",id); - List userByPortList = PageController.FindUserByMap(userParam,userToken); - Post postById = findPostById(id,userToken); + Map userParam = new HashMap<>(); + userParam.put("position", id); + List userByPortList = PageController.FindUserByMap(userParam, userToken); + Post postById = findPostById(id, userToken); PostP pp = new PostP(postById); - Map param = new HashMap<>(); - param.put("depositoryId",depositoryId); - param.put("userId",userByPortList.get(0).getId()); + Map param = new HashMap<>(); + param.put("depositoryId", depositoryId); + param.put("userId", userByPortList.get(0).getId()); List roleAndDepositoryByCondition = roleService.findRoleAndDepositoryByCondition(param); pp.setDepositoryName(roleAndDepositoryByCondition.get(0).getDepositoryName()); pp.setDepositoryId(roleAndDepositoryByCondition.get(0).getDepositoryId()); @@ -802,22 +812,22 @@ public class PageController { } @GetMapping("/user_detail") - public ModelAndView user_edit(Integer id,HttpServletRequest request) { - UserByPort userToken= (UserByPort) request.getAttribute("userToken"); + public ModelAndView user_edit(Integer id, HttpServletRequest request) { + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/user/user-edit"); mv.addObject("depositories", depositoryService.findDepositoryAll()); - Map map = new HashMap<>(); - map.put("number",id.toString()); - UserByPort userByPort = FindUserByMap(map,userToken).get(0); + Map map = new HashMap<>(); + map.put("number", id.toString()); + UserByPort userByPort = FindUserByMap(map, userToken).get(0); mv.addObject("user", userByPort); return mv; } @GetMapping("/warehouse_view") - public ModelAndView warehouse_view(Integer id,HttpServletRequest request) { - UserByPort userToken= (UserByPort) request.getAttribute("userToken"); + public ModelAndView warehouse_view(Integer id, HttpServletRequest request) { + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/warehouse/warehouse_view"); if (id != null) { @@ -826,7 +836,7 @@ public class PageController { mv.addObject("record", depositoryRecordById); Integer cid = depositoryRecordById.getCid(); - List postList = findCompanyBySuperior(cid.toString(),userToken); + List postList = findCompanyBySuperior(cid.toString(), userToken); List administrationPList = findAllCompany(userToken); // 部门列表 mv.addObject("postList", postList); @@ -840,7 +850,7 @@ public class PageController { } @GetMapping("/warehouseByParentId") - public ModelAndView warehouseByParentId(Integer parentId,HttpServletRequest request) { + public ModelAndView warehouseByParentId(Integer parentId, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/warehouse/warehouseByParentId"); @@ -848,7 +858,7 @@ public class PageController { Map param = new HashMap<>(); param.put("parentId", parentId); mv.addObject("parentId", parentId); - mv.addObject("depositories", depositoryService.findDepositoryRecordPByCondition(param,userToken)); + mv.addObject("depositories", depositoryService.findDepositoryRecordPByCondition(param, userToken)); } else { throw new MyException("缺少必要参数！"); } @@ -870,40 +880,40 @@ public class PageController { } @GetMapping("/insertPlace") - public ModelAndView insertPlace(Integer depositoryId){ + public ModelAndView insertPlace(Integer depositoryId) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/place/place_add"); - if(depositoryId != null){ - mv.addObject("depositoryId",depositoryId); - }else{ + if (depositoryId != null) { + mv.addObject("depositoryId", depositoryId); + } else { throw new MyException("缺少必要参数！"); } return mv; } @GetMapping("/insertListPlace") - public ModelAndView insertListPlace(Integer depositoryId){ + public ModelAndView insertListPlace(Integer depositoryId) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/place/place_list_add"); - if(depositoryId != null){ - mv.addObject("depositoryId",depositoryId); - }else{ + if (depositoryId != null) { + mv.addObject("depositoryId", depositoryId); + } else { throw new MyException("缺少必要参数！"); } return mv; } @GetMapping("findWareHouseByParentId") - public ModelAndView findWareHouseByParentId(Integer parentId,HttpServletRequest request) { - UserByPort userByPort = (UserByPort)request.getAttribute("userToken"); + public ModelAndView findWareHouseByParentId(Integer parentId, HttpServletRequest request) { + UserByPort userByPort = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); if (parentId != null) { Map param = new HashMap<>(); param.put("parentId", parentId); mv.addObject("parentId", parentId); - List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param,userByPort); + List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param, userByPort); Integer role = userByPort.getIsadmin(); - if(role == null){ + if (role == null) { role = 1; } if (role == 4) { @@ -916,7 +926,7 @@ public class PageController { mv.setViewName("pages/warehouse/depository-out"); } else { List placeByDid = placeService.findPlaceByDid(parentId); - mv.addObject("placeList",placeByDid); + mv.addObject("placeList", placeByDid); mv.setViewName("pages/warehouse/warehouseByParentId"); } @@ -941,6 +951,7 @@ public class PageController { mv.setViewName("pages/user/userRole"); return mv; } + @GetMapping("/postRoleView") public ModelAndView findPostRoleView(Integer id) { ModelAndView mv = new ModelAndView(); @@ -959,7 +970,7 @@ public class PageController { } @GetMapping("findMaterialTypeByParentId") - public ModelAndView findMaterialTypeByParentId(Integer parentId,HttpServletRequest request) { + public ModelAndView findMaterialTypeByParentId(Integer parentId, HttpServletRequest request) { UserByPort userByPort = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); if (parentId != null) { @@ -968,7 +979,7 @@ public class PageController { mv.addObject("parentId", parentId); List materialTypeByCondition = materialTypeService.findMaterialTypeByCondition(param); Integer role = userByPort.getIsadmin(); - if(role == null){ + if (role == null) { role = 1; } if (role == 4) { @@ -1005,7 +1016,7 @@ public class PageController { } @GetMapping("/application_review") - public ModelAndView application_review(Integer id,HttpServletRequest request) { + public ModelAndView application_review(Integer id, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/application/application-review"); @@ -1036,7 +1047,7 @@ public class PageController { Depository depository = depositoryService.findDepositoryRecordById(applicationOutRecordMin.getDepositoryId()); // 获取出库库位 Place placeById = placeService.findPlaceById(applicationOutRecordMin.getPlaceId()); - if(placeById != null) { + if (placeById != null) { placeCode.append(placeById.getCode()).append(","); } mname.append(materialById.getMname()).append(","); @@ -1046,31 +1057,31 @@ public class PageController { sumPrice += (materialById.getPrice()); } // 申请人 - UserByPort userByPort = FindUserById(recordP.getApplicantId(),userToken); + UserByPort userByPort = FindUserById(recordP.getApplicantId(), userToken); // 部门负责人 String departmentheads = recordP.getDepartmenthead(); String[] split = departmentheads.split(","); StringBuilder departmentHeadName = new StringBuilder(); for (int i = 0; i < split.length; i++) { - UserByPort departmenthead = FindUserById(ObjectFormatUtil.toInteger(split[i]),userToken); + UserByPort departmenthead = FindUserById(ObjectFormatUtil.toInteger(split[i]), userToken); departmentHeadName.append(departmenthead.getName()).append(","); } // 仓储中心负责人 String manager = recordP.getDepositoryManager(); String[] depositoryManagerId = new String[0]; - if(manager != null){ + if (manager != null) { depositoryManagerId = manager.split(","); } List depositoryManager = new ArrayList<>(); String depositoryManagerNames = ""; for (int i = 0; i < depositoryManagerId.length; i++) { Integer managerid = ObjectFormatUtil.toInteger(depositoryManagerId[i]); - UserByPort user = FindUserById(managerid,userToken); + UserByPort user = FindUserById(managerid, userToken); depositoryManager.add(user); - depositoryManagerNames += user.getName() +","; + depositoryManagerNames += user.getName() + ","; } - if(recordP.getPlaceId() != null) { + if (recordP.getPlaceId() != null) { Place placeById = placeService.findPlaceById(recordP.getPlaceId()); recordP.setPCode(placeById.getCode()); } @@ -1089,13 +1100,13 @@ public class PageController { } @GetMapping("/form_step_look") - public ModelAndView form_step_look(Integer id,HttpServletRequest request) { + public ModelAndView form_step_look(Integer id, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/application/form-step-look"); if (id != null) { ApplicationInRecordP applicationInRecordPById = depositoryRecordService.findApplicationInRecordPById(id); - UserByPort userByPort = FindUserById(applicationInRecordPById.getApplicantId(),userToken); + UserByPort userByPort = FindUserById(applicationInRecordPById.getApplicantId(), userToken); applicationInRecordPById.setApplicantName(userByPort.getName()); applicationInRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationInRecordPById.getApplicantTime()))); applicationInRecordPById.setPrice(applicationInRecordPById.getPrice() / 100); @@ -1108,11 +1119,11 @@ public class PageController { } @GetMapping("/form_step_lookByminRecordOut") - public ModelAndView form_step_lookByminRecordOut(Integer id,HttpServletRequest request){ + public ModelAndView form_step_lookByminRecordOut(Integer id, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/application/form-step-look_minRecordOut"); - if(id != null){ + if (id != null) { // 获取当前子订单 ApplicationOutRecordMin recordMin = depositoryRecordService.findApplicationOutMinById(id); ApplicationOutRecordMinP recordMinP = new ApplicationOutRecordMinP(recordMin); @@ -1130,11 +1141,11 @@ public class PageController { recordMinP.setMname(materialById.getMname()); recordMinP.setMcode(materialById.getCode()); recordMinP.setPlaceCode(placeById.getCode()); - Double price = (materialById.getPrice()) * recordMinP.getQuantity(); + Double price = (materialById.getPrice()) * recordMinP.getQuantity(); BigDecimal bg = new BigDecimal(price); - price = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + price = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); recordMinP.setPrice(price); - mv.addObject("recordMinP",recordMinP); + mv.addObject("recordMinP", recordMinP); } else { throw new MyException("缺少必要参数！"); } @@ -1144,7 +1155,7 @@ public class PageController { // 跳转到出库详情 @GetMapping("/ApplicationOutView") - public ModelAndView ApplicationOutView(Integer id,HttpServletRequest request) { + public ModelAndView ApplicationOutView(Integer id, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/application/form-step-look_back"); @@ -1174,8 +1185,8 @@ public class PageController { for (int i = 0; i < applicationOutRecordMinByParent.size(); i++) { // 获取子订单信息 ApplicationOutRecordMin applicationOutRecordMin = applicationOutRecordMinByParent.get(i); - // 获取输出子订单信息 - ApplicationOutRecordMinP recordMinP = new ApplicationOutRecordMinP(applicationOutRecordMin); + // 获取输出子订单信息 + ApplicationOutRecordMinP recordMinP = new ApplicationOutRecordMinP(applicationOutRecordMin); // 获取出库物料信息 Material materialById = materialService.findMaterialById(applicationOutRecordMin.getMid()); @@ -1183,56 +1194,56 @@ public class PageController { Depository depository = depositoryService.findDepositoryRecordById(applicationOutRecordMin.getDepositoryId()); // 获取出库库位 Place placeById = placeService.findPlaceById(applicationOutRecordMin.getPlaceId()); - if(placeById != null) { + if (placeById != null) { placeCode.append(placeById.getCode()).append(","); } recordMinP.setMname(materialById.getMname()); recordMinP.setDepositoryName(depository.getDname()); recordMinP.setPlaceCode(placeById.getCode()); Integer checkId = applicationOutRecordMin.getCheckId(); - if(checkId != null){ + if (checkId != null) { // 如果当前子订单已经处理 // 获取当前处理人 UserByPort disposer = FindUserById(checkId, userToken); - outDisposer.append(disposer.getName()+","); + outDisposer.append(disposer.getName() + ","); recordMinP.setCheckerName(disposer.getName()); - }else{ + } else { outDisposer.append("暂未处理,"); recordMinP.setCheckerName("暂未处理"); } mname.append(materialById.getMname()).append(","); mcode.append(materialById.getCode()).append(","); depositoryName.append(depository.getDname()).append(","); - quantityByMaterial.append(applicationOutRecordMin.getQuantity()+","); + quantityByMaterial.append(applicationOutRecordMin.getQuantity() + ","); sumQuantity += applicationOutRecordMin.getQuantity(); sumPrice += (materialById.getPrice()); recordMinPList.add(recordMinP); } // 申请人 - UserByPort userByPort = FindUserById(applicationOutRecordPById.getApplicantId(),userToken); + UserByPort userByPort = FindUserById(applicationOutRecordPById.getApplicantId(), userToken); // 部门负责人 String departmentHead = applicationOutRecordPById.getDepartmenthead(); String[] split = departmentHead.split(","); - if("".equals(departmentHead)||departmentHead.isEmpty()){ + if ("".equals(departmentHead) || departmentHead.isEmpty()) { // 如果当前没有部门负责人 split = new String[0]; } StringBuilder departmentHeadName = new StringBuilder(); for (int i = 0; i < split.length; i++) { - UserByPort departmenthead = FindUserById(ObjectFormatUtil.toInteger(split[i]),userToken); + UserByPort departmenthead = FindUserById(ObjectFormatUtil.toInteger(split[i]), userToken); departmentHeadName.append(departmenthead.getName()).append(","); } // 仓储中心负责人 String manager = applicationOutRecordPById.getDepositoryManager(); String[] depositoryManagerId = new String[0]; - if(manager != null){ + if (manager != null) { depositoryManagerId = manager.split(","); } List depositoryManager = new ArrayList<>(); String depositoryManagerNames = ""; for (int i = 0; i < depositoryManagerId.length; i++) { Integer managerid = ObjectFormatUtil.toInteger(depositoryManagerId[i]); - UserByPort user = FindUserById(managerid,userToken); + UserByPort user = FindUserById(managerid, userToken); depositoryManager.add(user); depositoryManagerNames += user.getName(); } @@ -1249,8 +1260,8 @@ public class PageController { applicationOutRecordPById.setDepositoryName(depositoryName.toString()); applicationOutRecordPById.setPCode(placeCode.toString()); mv.addObject("record", applicationOutRecordPById); - mv.addObject("outDisposer",outDisposer.toString()); - mv.addObject("recordMinList",recordMinPList); + mv.addObject("outDisposer", outDisposer.toString()); + mv.addObject("recordMinList", recordMinPList); } else { throw new MyException("缺少必要参数！"); } @@ -1258,10 +1269,8 @@ public class PageController { } - - @GetMapping("/StockTakingReview") - public ModelAndView StockTakingReview(Integer id,HttpServletRequest request){ + public ModelAndView StockTakingReview(Integer id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); UserByPort userToken = (UserByPort) request.getAttribute("userToken"); @@ -1275,7 +1284,7 @@ public class PageController { stp.setCreateTime(DateUtil.TimeStampToDateTime(stockTaking.getCreateTime())); // 获取申请人 - UserByPort userByPort = FindUserById(stockTaking.getOriginator(),userToken); + UserByPort userByPort = FindUserById(stockTaking.getOriginator(), userToken); // 设置盘点发起人姓名 stp.setOriginatorName(userByPort.getName()); @@ -1284,11 +1293,11 @@ public class PageController { String[] split = stp.getDepartmentManager().split(","); for (int i = 0; i < split.length; i++) { String s = split[i]; - if("".equals(s)){ + if ("".equals(s)) { continue; } UserByPort manager = FindUserById(ObjectFormatUtil.toInteger(s), userToken); - managerName.append(manager.getName()+","); + managerName.append(manager.getName() + ","); } stp.setDepartmentManagerName(managerName.toString()); @@ -1297,22 +1306,22 @@ public class PageController { StringBuilder location = new StringBuilder(); Depository depository = depositoryService.findDepositoryRecordById(stockTaking.getDepositoryId()); location.append(depository.getDname()); - if(!(Integer.compare(placeId,0) == 0)){ + if (!(Integer.compare(placeId, 0) == 0)) { // 如果不是默认库位 Place placeById = placeService.findPlaceById(placeId); - location.append("-"+placeById.getCode()); + location.append("-" + placeById.getCode()); } // 设置盘点位置 stp.setDepositoryName(location.toString()); - mv.addObject("mainRecord",stp); - mv.addObject("recordChild",stockTakingChildPByMainId); + mv.addObject("mainRecord", stp); + mv.addObject("recordChild", stockTakingChildPByMainId); Integer departmentManagerState = stp.getDepartmentManagerState(); - if(Integer.compare(departmentManagerState,3) == 0){ + if (Integer.compare(departmentManagerState, 3) == 0) { // 如果当前盘点记录未经过负责人处理 // 跳转到审核页面 mv.setViewName("pages/stockTaking/stockTakingReview"); - }else{ + } else { // 跳转到处理页面 mv.setViewName("pages/stockTaking/stockTakingComplete"); @@ -1322,7 +1331,7 @@ public class PageController { // 跳转到盘点详情 @GetMapping("/StockTakingView") - public ModelAndView StockTakingView(Integer id,HttpServletRequest request){ + public ModelAndView StockTakingView(Integer id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); UserByPort userToken = (UserByPort) request.getAttribute("userToken"); mv.setViewName("pages/stockTaking/stockTakingView"); @@ -1339,7 +1348,7 @@ public class PageController { stp.setReviewTime(""); // 获取审核时间 Long reviewTime = stockTaking.getReviewTime(); - if(reviewTime != null){ + if (reviewTime != null) { // 如果已经完成审核 stp.setReviewTime(DateUtil.TimeStampToDateTime(reviewTime)); } @@ -1348,14 +1357,14 @@ public class PageController { stp.setCompleteTime(""); // 获取完成时间 Long completeTime = stockTaking.getCompleteTime(); - if(completeTime != null){ + if (completeTime != null) { // 如果已经完成审核 stp.setCompleteTime(DateUtil.TimeStampToDateTime(completeTime)); } // 获取申请人 - UserByPort userByPort = FindUserById(stockTaking.getOriginator(),userToken); + UserByPort userByPort = FindUserById(stockTaking.getOriginator(), userToken); // 设置盘点发起人姓名 stp.setOriginatorName(userByPort.getName()); @@ -1364,11 +1373,11 @@ public class PageController { String[] split = stp.getDepartmentManager().split(","); for (int i = 0; i < split.length; i++) { String s = split[i]; - if("".equals(s)){ + if ("".equals(s)) { continue; } UserByPort manager = FindUserById(ObjectFormatUtil.toInteger(s), userToken); - managerName.append(manager.getName()+","); + managerName.append(manager.getName() + ","); } stp.setDepartmentManagerName(managerName.toString()); @@ -1377,15 +1386,15 @@ public class PageController { StringBuilder location = new StringBuilder(); Depository depository = depositoryService.findDepositoryRecordById(stockTaking.getDepositoryId()); location.append(depository.getDname()); - if(!(Integer.compare(placeId,0) == 0)){ + if (!(Integer.compare(placeId, 0) == 0)) { // 如果不是默认库位 Place placeById = placeService.findPlaceById(placeId); - location.append("-"+placeById.getCode()); + location.append("-" + placeById.getCode()); } // 设置盘点位置 stp.setDepositoryName(location.toString()); - mv.addObject("mainRecord",stp); - mv.addObject("recordChild",stockTakingChildPByMainId); + mv.addObject("mainRecord", stp); + mv.addObject("recordChild", stockTakingChildPByMainId); return mv; } @@ -1399,11 +1408,11 @@ public class PageController { StringBuilder DepositoryName = new StringBuilder(); for (int i = 0; i < depositoryAndRole.size(); i++) { String roleName = depositoryAndRole.get(i).getRoleName(); - if(roleName == null){ + if (roleName == null) { roleName = ""; } String depositoryName = depositoryAndRole.get(i).getDepositoryName(); - if(depositoryName == null){ + if (depositoryName == null) { depositoryName = ""; } RoleName.append(roleName + " "); @@ -1428,21 +1437,21 @@ public class PageController { public List findAllCompany(UserByPort userByPort) { - String url = PortConfig.external_url + "/org/govlist"; + String url = PortConfig.external_url + "/org/govlist"; Map map = new HashMap<>(); map.put("superior", "313"); String jsonString = JSONObject.toJSONString(map); JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userByPort); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userByPort); } catch (IOException e) { e.printStackTrace(); } JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); JSONArray list = (JSONArray) data.get("list"); - if(list == null){ + if (list == null) { list = new JSONArray(); } Integer total = ObjectFormatUtil.toInteger(data.get("total")); @@ -1457,7 +1466,7 @@ public class PageController { @GetMapping("/company_out") public ModelAndView Company_Out(HttpServletRequest request) { - UserByPort userToken= (UserByPort) request.getAttribute("userToken"); + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/company/company-out"); List administrationPList = findAllCompany(userToken); @@ -1477,7 +1486,7 @@ public class PageController { @GetMapping("/company_detail") - public ModelAndView company_detail(Integer id,HttpServletRequest request) { + public ModelAndView company_detail(Integer id, HttpServletRequest request) { UserByPort userByPort = (UserByPort) request.getAttribute("userToken"); String url = PortConfig.external_url + "/org/getgovcont"; Map map = new HashMap<>(); @@ -1490,14 +1499,14 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userByPort); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userByPort); } catch (IOException e) { e.printStackTrace(); } JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); Administration administration = JSONObject.toJavaObject(data, Administration.class); - String SuperiorName = getCompany(administration.getSuperior(),userByPort).getName(); + String SuperiorName = getCompany(administration.getSuperior(), userByPort).getName(); mv.addObject("record", administration); mv.addObject("SuperiorName", SuperiorName); } else { @@ -1506,7 +1515,7 @@ public class PageController { return mv; } - public static Administration getCompany(Integer id,UserByPort userByPort) { + public static Administration getCompany(Integer id, UserByPort userByPort) { String url = PortConfig.external_url + "/org/getgovcont"; Map map = new HashMap<>(); map.put("id", id); @@ -1515,7 +1524,7 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userByPort); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userByPort); } catch (IOException e) { e.printStackTrace(); } @@ -1526,8 +1535,7 @@ public class PageController { } - - public static List findCompanyBySuperior(String superior,UserByPort userByPort) { + public static List findCompanyBySuperior(String superior, UserByPort userByPort) { String url = PortConfig.external_url + "/org/govlist"; Map map = new HashMap<>(); map.put("superior", superior); @@ -1535,14 +1543,14 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userByPort); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userByPort); } catch (IOException e) { e.printStackTrace(); } JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); JSONArray list = (JSONArray) data.get("list"); - if(list == null){ + if (list == null) { list = new JSONArray(); } Integer total = ObjectFormatUtil.toInteger(data.get("total")); @@ -1556,12 +1564,12 @@ public class PageController { } @GetMapping("/findCompanyByParentId") - public ModelAndView findCompanyByParentId(Integer parentId,HttpServletRequest request) { - UserByPort userToken= (UserByPort) request.getAttribute("userToken"); + public ModelAndView findCompanyByParentId(Integer parentId, HttpServletRequest request) { + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); if (parentId != null) { mv.addObject("parentId", parentId); - List administrationPList = findCompanyBySuperior(parentId.toString(),userToken); + List administrationPList = findCompanyBySuperior(parentId.toString(), userToken); if (administrationPList.size() > 0) { mv.addObject("administrationPList", administrationPList); mv.setViewName("pages/company/company-out"); @@ -1575,8 +1583,8 @@ public class PageController { } @GetMapping("/findPostByOrganization") - public ModelAndView findPostByOrganization(Integer organization,HttpServletRequest request) { - UserByPort userToken= (UserByPort) request.getAttribute("userToken"); + public ModelAndView findPostByOrganization(Integer organization, HttpServletRequest request) { + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); String url = PortConfig.external_url + "/org/positionlist"; ModelAndView mv = new ModelAndView(); mv.setViewName("pages/post/post-out"); @@ -1588,14 +1596,14 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userToken); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userToken); } catch (IOException e) { e.printStackTrace(); } JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); JSONArray list = (JSONArray) data.get("list"); - if(list == null){ + if (list == null) { list = new JSONArray(); } List postList = new ArrayList<>(); @@ -1613,12 +1621,12 @@ public class PageController { } @GetMapping("/post_detail") - public ModelAndView post_detail(Integer id,HttpServletRequest request) { - UserByPort userToken= (UserByPort) request.getAttribute("userToken"); + public ModelAndView post_detail(Integer id, HttpServletRequest request) { + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/post/post-view"); if (id != null) { - Post object = findPostById(id,userToken); + Post object = findPostById(id, userToken); mv.addObject("record", object); } else { throw new MyException("缺少必要参数！"); @@ -1626,7 +1634,7 @@ public class PageController { return mv; } - public static Post findPostById(Integer id,UserByPort userByPort) { + public static Post findPostById(Integer id, UserByPort userByPort) { String url = PortConfig.external_url + "/org/getpositioncont"; Map map = new HashMap<>(); map.put("id", id); @@ -1635,7 +1643,7 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userByPort); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userByPort); } catch (IOException e) { e.printStackTrace(); } @@ -1647,8 +1655,8 @@ public class PageController { @GetMapping("/findPostByParentId") - public ModelAndView findPostByParentId(Integer parentId,HttpServletRequest request) { - UserByPort userToken= (UserByPort) request.getAttribute("userToken"); + public ModelAndView findPostByParentId(Integer parentId, HttpServletRequest request) { + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); String url = PortConfig.external_url + "/org/positionlist"; ModelAndView mv = new ModelAndView(); if (parentId != null) { @@ -1659,14 +1667,14 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userToken); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userToken); } catch (IOException e) { e.printStackTrace(); } JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); JSONArray list = (JSONArray) data.get("list"); - if(list == null){ + if (list == null) { list = new JSONArray(); } Integer total = ObjectFormatUtil.toInteger(data.get("total")); @@ -1690,11 +1698,11 @@ public class PageController { // 跳转到添加权限界面 @GetMapping("/postRoleAdd") - public ModelAndView PostRoleAdd(Integer id,HttpServletRequest request) { - UserByPort userToken= (UserByPort) request.getAttribute("userToken"); + public ModelAndView PostRoleAdd(Integer id, HttpServletRequest request) { + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/post/postRole_add"); - Post postById = findPostById(id,userToken); + Post postById = findPostById(id, userToken); mv.addObject("post", postById); mv.addObject("roles", roleService.findAllRole()); mv.addObject("depositories", depositoryService.findDepositoryAll()); @@ -1703,86 +1711,93 @@ public class PageController { // 跳转到扫码界面 @GetMapping("/scanQrCode") - public String scanQrCode(){ + public String scanQrCode() { return "pages/scanQrCode/ScanQrCode"; } + // 跳转到扫码入库界面 @GetMapping("/scanQrCodeIn") - public String scanQrCodeIn(){ + public String scanQrCodeIn() { return "pages/scanQrCode/ScanQrCodeIn"; } + // 用于扫码条形码 @GetMapping("/scanBarCode") - public String scanBarCode(){ + public String scanBarCode() { return "pages/scanQrCode/ScanBarCode"; } // 跳转到扫码盘点物料界面 @GetMapping("/scanMaterialCodeForTaking") - public ModelAndView scanMaterialCodeForTaking(Integer depositoryId,Integer placeId){ + public ModelAndView scanMaterialCodeForTaking(Integer depositoryId, Integer placeId) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/scanQrCode/ScanMaterialCodeForTaking"); - mv.addObject("depositoryId",depositoryId); - mv.addObject("placeId",placeId); + mv.addObject("depositoryId", depositoryId); + mv.addObject("placeId", placeId); return mv; } + // 用于扫码条形码 @GetMapping("/scanBarCodeByNew") - public String scanBarCodeByNew(){ + public String scanBarCodeByNew() { return "pages/scanQrCode/ScanBarCodeByNew"; } + // 用于扫码条形码进行盘点物料 @GetMapping("/scanBarCodeForTaking") - public String scanBarCodeForTaking(){ + public String scanBarCodeForTaking() { return "pages/scanQrCode/ScanBarCodeForTaking"; } + // 跳转到扫码出库界面 @GetMapping("/scanQrCodeByOut") - public ModelAndView scanQrCodeByOut(Integer id,HttpServletRequest request){ + public ModelAndView scanQrCodeByOut(Integer id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); // 获取当前要处理的子订单 ApplicationOutRecordMin applicationOutMinById = depositoryRecordService.findApplicationOutMinById(id); mv.setViewName("pages/scanQrCode/scanQrCodeOut"); Material materialById = materialService.findMaterialById(applicationOutMinById.getMid()); - mv.addObject("materialById",materialById); - mv.addObject("record",applicationOutMinById); + mv.addObject("materialById", materialById); + mv.addObject("record", applicationOutMinById); return mv; } + // 跳转到新扫码出库界面 @GetMapping("/scanBarOrQrCodeOut") - public ModelAndView scanBarOrQrCodeOut(Integer id,HttpServletRequest request){ + public ModelAndView scanBarOrQrCodeOut(Integer id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); // 获取当前要处理的子订单 ApplicationOutRecordMin applicationOutMinById = depositoryRecordService.findApplicationOutMinById(id); mv.setViewName("pages/scanQrCode/ScanBarOrQrCodeOut"); Material materialById = materialService.findMaterialById(applicationOutMinById.getMid()); - mv.addObject("materialById",materialById); - mv.addObject("record",applicationOutMinById); + mv.addObject("materialById", materialById); + mv.addObject("record", applicationOutMinById); return mv; } + @GetMapping("/scanQrCodeTransfer") - public ModelAndView scanQrCodeTransfer(HttpServletRequest request){ + public ModelAndView scanQrCodeTransfer(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/scanQrCode/scanQrCodeTransfer"); return mv; } @GetMapping("/scanBarCodeIn") - public String scanBarCodeIn(){ + public String scanBarCodeIn() { // return "pages/scanQrCode/ScanBarCodeIn"; return "pages/QyWxScanCode/QyWxScanBarCodeIn"; } @GetMapping("/qywxScanBarCodeIn") - public ModelAndView qywxScanBarCodeIn(HttpServletRequest request){ + public ModelAndView qywxScanBarCodeIn(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/QyWxScanCode/QyWxScanBarCodeIn"); return mv; } @GetMapping("/scanBarCodeOut") - public ModelAndView scanBarCodeOut(){ + public ModelAndView scanBarCodeOut() { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/scanQrCode/ScanBarCodeOut"); return mv; @@ -1790,117 +1805,117 @@ public class PageController { // 获取扫描结果并跳转到入库 @GetMapping("/application_in_scanQrCode") - public ModelAndView applicationInScanQrCode(HttpServletRequest request){ + public ModelAndView applicationInScanQrCode(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); UserByPort userByPort = (UserByPort) request.getAttribute("userToken"); - String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue"+userByPort.getNumber()).toString(); - redisTemplate.delete("scanQrCodeValue"+userByPort.getNumber()); + String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue" + userByPort.getNumber()).toString(); + redisTemplate.delete("scanQrCodeValue" + userByPort.getNumber()); JSONObject jsonObject = JSONObject.parseObject(scanQrCodeValue); JSONObject depository = (JSONObject) jsonObject.get("depository"); JSONObject place = (JSONObject) jsonObject.get("place"); JSONArray materialList = (JSONArray) jsonObject.get("materialList"); - if(depository == null && place == null){ + if (depository == null && place == null) { // 如果库位与仓库都未选中 - }else if(depository != null && place == null){ + } else if (depository != null && place == null) { // 如果选中仓库未选中库位 - mv.addObject("depository",depository); - }else if(place != null && depository == null){ + mv.addObject("depository", depository); + } else if (place != null && depository == null) { // 如果选中库位未选中仓库 - mv.addObject("place",place); + mv.addObject("place", place); } - mv.addObject("materialList",materialList); + mv.addObject("materialList", materialList); mv.setViewName("pages/application/application-in_scanQrCode"); return mv; } @GetMapping("/applicationInByMaterial") - public ModelAndView applicationInByMaterial(HttpServletRequest request){ + public ModelAndView applicationInByMaterial(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); UserByPort userByPort = (UserByPort) request.getAttribute("userToken"); - String scanQrCodeValue = (String)redisTemplate.opsForValue().get("temporaryValueForMaterial"+userByPort.getNumber()).toString(); - redisTemplate.delete("temporaryValueForMaterial"+userByPort.getNumber()); + String scanQrCodeValue = redisTemplate.opsForValue().get("temporaryValueForMaterial" + userByPort.getNumber()).toString(); + redisTemplate.delete("temporaryValueForMaterial" + userByPort.getNumber()); JSONObject jsonObject = JSONObject.parseObject(scanQrCodeValue); JSONArray mids = (JSONArray) jsonObject.get("mids"); List materialList = new ArrayList<>(); for (int i = 0; i < mids.size(); i++) { - Map param = new HashMap<>(); + Map param = new HashMap<>(); Integer o = ObjectFormatUtil.toInteger(mids.get(i)); - MaterialP mp = new MaterialP( materialService.findMaterialById(o)); - param.put("mid",mp.getId()); - param.put("mname",mp.getMname()); - param.put("code",mp.getCode()); - param.put("price",mp.getPrice()); - param.put("version",mp.getVersion()); + MaterialP mp = new MaterialP(materialService.findMaterialById(o)); + param.put("mid", mp.getId()); + param.put("mname", mp.getMname()); + param.put("code", mp.getCode()); + param.put("price", mp.getPrice()); + param.put("version", mp.getVersion()); List materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param); - param.put("materialAndBarCodeList",materialByBarCodeByCondition); + param.put("materialAndBarCodeList", materialByBarCodeByCondition); String context = JSONObject.toJSONString(param); materialList.add(context); } - mv.addObject("materialList",materialList); + mv.addObject("materialList", materialList); mv.setViewName("pages/application/application-in_scanQrCode"); return mv; } // 获取扫描结果并跳转到出库 @GetMapping("/application_Out_scanQrCode") - public ModelAndView applicationOutScanQrCode(HttpServletRequest request){ + public ModelAndView applicationOutScanQrCode(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); UserByPort userByPort = (UserByPort) request.getAttribute("userToken"); - String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue"+userByPort.getNumber()).toString(); - redisTemplate.delete("scanQrCodeValue"+userByPort.getNumber()); + String scanQrCodeValue = redisTemplate.opsForValue().get("scanQrCodeValue" + userByPort.getNumber()).toString(); + redisTemplate.delete("scanQrCodeValue" + userByPort.getNumber()); JSONObject jsonObject = JSONObject.parseObject(scanQrCodeValue); JSONObject depository = (JSONObject) jsonObject.get("depository"); JSONObject place = (JSONObject) jsonObject.get("place"); JSONArray materialList = (JSONArray) jsonObject.get("materialList"); - if(depository == null && place == null){ + if (depository == null && place == null) { // 如果库位与仓库都未选中 - }else if(depository != null && place == null){ + } else if (depository != null && place == null) { // 如果选中仓库未选中库位 - mv.addObject("depository",depository); - }else if(place != null && depository == null){ + mv.addObject("depository", depository); + } else if (place != null && depository == null) { // 如果选中库位未选中仓库 - mv.addObject("place",place); + mv.addObject("place", place); } - mv.addObject("materialList",materialList); + mv.addObject("materialList", materialList); mv.setViewName("pages/application/application-out_scanQrCode"); return mv; } // 当前仓库中该用户的子订单详情,用于pc端 @GetMapping("/ApplicationOutMinByDid") - public ModelAndView ApplicationOutMinByDid(Integer depositoryId,Integer state,HttpServletRequest request){ + public ModelAndView ApplicationOutMinByDid(Integer depositoryId, Integer state, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); - mv.addObject("depositoryId",depositoryId); - mv.addObject("state",state); + mv.addObject("depositoryId", depositoryId); + mv.addObject("state", state); mv.setViewName("pages/application/application-out_min"); return mv; } // 当前仓库中该用户的子订单详情,用于移动端 @GetMapping("/ApplicationOutMinByDidForMobile") - public ModelAndView ApplicationOutMinByDidForMobile(Integer depositoryId,Integer state,HttpServletRequest request){ + public ModelAndView ApplicationOutMinByDidForMobile(Integer depositoryId, Integer state, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); Depository depository = depositoryService.findDepositoryRecordById(depositoryId); - mv.addObject("depositoryId",depositoryId); - mv.addObject("state",state); - mv.addObject("depository",depository); + mv.addObject("depositoryId", depositoryId); + mv.addObject("state", state); + mv.addObject("depository", depository); mv.setViewName("pages/application/application-out_min-mobile"); return mv; } // 当前物料所关联的条形码 @GetMapping("/checkBarCode") - public ModelAndView checkBarCode(Integer mid){ + public ModelAndView checkBarCode(Integer mid) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/materialBarCode/materialBarCode_out"); - mv.addObject("mid",mid); + mv.addObject("mid", mid); return mv; } // 跳转至库存盘点页面 @GetMapping("/stockTaking") - public ModelAndView stockTaking(HttpServletRequest request){ + public ModelAndView stockTaking(HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); // 获取仓储中心详情 @@ -1914,15 +1929,15 @@ public class PageController { departmentHeadName.append(userByPort.getName()).append(","); departmentHeadId.append(userByPort.getId()).append(","); } - mv.addObject("departmentHeadName",departmentHeadName.toString()); - mv.addObject("departmentHeadId",departmentHeadId.toString()); + mv.addObject("departmentHeadName", departmentHeadName.toString()); + mv.addObject("departmentHeadId", departmentHeadId.toString()); mv.setViewName("pages/stockTaking/stockTaking"); return mv; } // 用于打开盘点后物料转移页面 @GetMapping("/stockTakingTransfer") - public ModelAndView stockTakingTransfer(String minIds,HttpServletRequest request){ + public ModelAndView stockTakingTransfer(String minIds, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); List takingChildPS = new ArrayList<>(); @@ -1930,14 +1945,13 @@ public class PageController { String[] split = minIds.split(","); for (int i = 0; i < split.length; i++) { String minRecordId = split[i]; - if("".equals(minRecordId)){ + if ("".equals(minRecordId)) { continue; } // 获取当前子订单 StockTakingChildP stcp = stockTakingService.findStockTakingChildPById(ObjectFormatUtil.toInteger(minRecordId)); - // 获取主订单 stockTaking = stockTakingService.findStockTakingById(stcp.getMainId()); @@ -1961,23 +1975,20 @@ public class PageController { takingChildPS.add(stcp); } - mv.addObject("mainRecord",stockTaking); - mv.addObject("recordChild",takingChildPS); - mv.addObject("minIds",minIds); + mv.addObject("mainRecord", stockTaking); + mv.addObject("recordChild", takingChildPS); + mv.addObject("minIds", minIds); mv.setViewName("pages/stockTaking/stockTransfer"); return mv; } - @GetMapping("/scanCodeByTaking") - public ModelAndView scanCodeByTaking(){ + public ModelAndView scanCodeByTaking() { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/scanQrCode/ScanCodeByTaking"); return mv; } - - } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java index d1978357..b4473dbd 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java @@ -215,7 +215,20 @@ public interface MaterialMapper { Integer deleteBarCodeAndMaterial(Map map); + /** + * 查询当前类型下的物料 + * @param oldId + * @return + */ List findMaterialByType(Long oldId); + /** + * 批量查询当前类型下的物料 + * @param list + * @return + */ + List findMaterialByTypeIds(List list); + + } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml index 489a8898..6974d571 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml @@ -245,6 +245,19 @@ + + + + + + + + `; + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } + else{ + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } + } form.render(); } }); diff --git a/src/main/resources/templates/pages/application/application-out_scanQrCode.html b/src/main/resources/templates/pages/application/application-out_scanQrCode.html index 1e7be332..4b7c7bdb 100644 --- a/src/main/resources/templates/pages/application/application-out_scanQrCode.html +++ b/src/main/resources/templates/pages/application/application-out_scanQrCode.html @@ -500,7 +500,8 @@ maxmin: true, shadeClose: true, //点击遮罩关闭层 area: ['70%', '70%'], - content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + // content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId, move : '.layui-layer-title', fixed:false, end: function () { diff --git a/src/main/resources/templates/pages/application/application-transfer.html b/src/main/resources/templates/pages/application/application-transfer.html index 109b22c3..ee0bad75 100644 --- a/src/main/resources/templates/pages/application/application-transfer.html +++ b/src/main/resources/templates/pages/application/application-transfer.html @@ -576,7 +576,6 @@ contentType: "application/json;charset=utf-8", success:function (res) { var idNumber = materialId.name.split("mid")[1]; - console.log(idNumber) // 获取物料与条形码的对应关系 var materialAndBarCodeList = d["materialAndBarCodeList"]; var barCode = $("#barCode" + idNumber); @@ -631,6 +630,8 @@ var materialName = materialItem[1]; var materialId = materialName.parentNode.parentNode.childNodes[3]; var mname = materialName.value; + var barCodeChildren = parent.childNodes[9]; + var barCodeItem = barCodeChildren.childNodes[3]; layer.open({ type: 2, title: '弹窗内容', @@ -638,7 +639,8 @@ maxmin: true, shadeClose: true, //点击遮罩关闭层 area: ['70%', '70%'], - content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + // content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId, move : '.layui-layer-title', fixed:false, end: function () { @@ -660,6 +662,34 @@ $.each(placeList, function (index, item) { $('#place').append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素 }); + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } + var idNumber = materialId.name.split("mid")[1]; + var materialAndBarCodeList = material["materialAndBarCodeList"]; + if (materialAndBarCodeList.length > 0) { + // 如果有对应的条形码 + var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; + var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; + var id = barCodeInput.id; + $("#" + id).remove(); + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } else { + var barCodeSelect = ` + `; + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); + + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } form.render(); } }); diff --git a/src/main/resources/templates/pages/application/application-transfer_back.html b/src/main/resources/templates/pages/application/application-transfer_back.html index 1e94f3e3..90baa339 100644 --- a/src/main/resources/templates/pages/application/application-transfer_back.html +++ b/src/main/resources/templates/pages/application/application-transfer_back.html @@ -382,7 +382,8 @@ maxmin: true, shadeClose: true, //点击遮罩关闭层 area: ['70%', '70%'], - content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + // content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId, move : '.layui-layer-title', fixed:false, end: function () { diff --git a/src/main/resources/templates/pages/material/selectMaterialByApproval.html b/src/main/resources/templates/pages/material/selectMaterialByApproval.html index a185c9a9..77c0a2f9 100644 --- a/src/main/resources/templates/pages/material/selectMaterialByApproval.html +++ b/src/main/resources/templates/pages/material/selectMaterialByApproval.html @@ -14,6 +14,8 @@ + + diff --git a/src/main/resources/templates/pages/stockTaking/stockTaking.html b/src/main/resources/templates/pages/stockTaking/stockTaking.html index 2bbc72f4..025c3d7c 100644 --- a/src/main/resources/templates/pages/stockTaking/stockTaking.html +++ b/src/main/resources/templates/pages/stockTaking/stockTaking.html @@ -665,7 +665,8 @@ area: ['70%', '70%'], move: '.layui-layer-title', fixed: false, - content: '/selectMaterialByCardForTaking?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId, + content: '/getMaterialAll?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId, + // content: '/selectMaterialByCardForTaking?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId, end: function () { var mid = materialId.value; $.ajax({ diff --git a/src/test/java/com/dreamchaser/depository_manage/Test.java b/src/test/java/com/dreamchaser/depository_manage/Test.java index d421b5d4..3ccfa050 100644 --- a/src/test/java/com/dreamchaser/depository_manage/Test.java +++ b/src/test/java/com/dreamchaser/depository_manage/Test.java @@ -1,6 +1,7 @@ package com.dreamchaser.depository_manage; +import cn.hutool.core.date.StopWatch; import cn.hutool.core.lang.Snowflake; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -26,13 +27,20 @@ import com.dreamchaser.depository_manage.pojo.callBackXml.callBackXml_button_tem import com.dreamchaser.depository_manage.pojo.callBackXml.callBackXml_button_templatecard.TemplateCard_SelectedItems; import com.dreamchaser.depository_manage.pojo.callBackXml.callBackXml_button_templatecard.TemplateCard_button_selection; import com.dreamchaser.depository_manage.service.*; +import com.dreamchaser.depository_manage.service.impl.MaterialServiceImpl; import com.dreamchaser.depository_manage.service.impl.QyWxOperationService; import com.dreamchaser.depository_manage.utils.*; +import lombok.Data; +import lombok.extern.log4j.Log4j; import lombok.extern.log4j.Log4j2; +import lombok.var; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringEscapeUtils; import org.apache.http.protocol.HTTP; +import org.apache.poi.poifs.property.Child; +import org.apache.poi.ss.formula.functions.Offset; +import org.apache.poi.ss.formula.functions.T; import org.dom4j.Element; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; @@ -85,15 +93,204 @@ public class Test { @Autowired MaterialTypeMapper materialTypeMapper; + + @Autowired + RedisTemplate redisTemplate; + @org.junit.Test public void test1() throws AesException, IOException, ParserConfigurationException, SAXException { - List objectList = materialService.InitTreeMenus(""); + List objectList = InitTree_Test(); + } + + + /** + * 用于深度拷贝列表 + * + * @param oldList + * @param + * @return + */ + public static List deepCopy(List oldList) { + List newList = (List) Arrays.asList(new Object[oldList.size()]); + Collections.copy(newList, oldList); + return newList; + } + + public List InitTree_Test() { + List materialTypeAll = materialTypeMapper.findMaterialTypeAll(); + Integer totalVal = materialTypeAll.size(); + double size = 100.0; + + Integer threadSize = (int) Math.ceil(totalVal / size); + // 开启对应数量的线程 + ExecutorService exs = Executors.newFixedThreadPool(threadSize); + // 结果集 + + List list = new ArrayList<>(); + + List> futureList = new ArrayList>(); + + // 1.定义CompletionService + CompletionService completionService = new ExecutorCompletionService(exs); + List materialTypeList = new ArrayList<>(); + for (int i = 0; i < materialTypeAll.size(); i++) { + MaterialType materialType = materialTypeAll.get(i); + if (((i + 1) % 100) == 0) { + Future future = completionService.submit(new TaskTest(materialTypeList)); + futureList.add(future); + materialTypeList = new ArrayList<>(); + } else { + materialTypeList.add(materialType.getOldId()); + } + } + + if (materialTypeList.size() > 0) { + Future future = completionService.submit(new TaskTest(materialTypeList)); + futureList.add(future); + } + + // 3.获取结果 + for (int i = 0; i < threadSize; i++) { + Object result = null; + try { + result = completionService.take().get(); + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (ExecutionException e) { + e.printStackTrace(); + } + list.add(result); + } + return list; + } + + // 用于执行测试新算法 + class TaskTest implements Callable { + + List materialTypeIdList; + + public TaskTest(List materialTypeByCondition) { + this.materialTypeIdList = materialTypeByCondition; + } + + @Override + public Object call() throws Exception { + + List list = new ArrayList<>(); + // 开启对应数量的线程 + + List materialByTypeIds = materialMapper.findMaterialByTypeIds(materialTypeIdList); + List materialTypeByOldIds = materialTypeMapper.findMaterialTypeByOldIds(materialTypeIdList); + + ExecutorService exs = Executors.newFixedThreadPool(materialTypeByOldIds.size()); + // 结果集 + List> futureList = new ArrayList>(); + + // 1.定义CompletionService + CompletionService completionService = new ExecutorCompletionService(exs); + + for (int i = 0; i < materialTypeByOldIds.size(); i++) { + MaterialType mt = materialTypeByOldIds.get(i); + Future future = completionService.submit(new MtTaskTest(mt, materialByTypeIds)); + futureList.add(future); + } + // 3.获取结果 + for (int i = 0; i < materialTypeIdList.size(); i++) { + Object result = null; + try { + result = completionService.take().get(); + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (ExecutionException e) { + e.printStackTrace(); + } + list.add(result); + } + + return list; + } + + + } + + // 用于执行测试新算法 + class MtTaskTest implements Callable { + + MaterialType mt; + List materiaList; + + public MtTaskTest(MaterialType mt, List materiaList) { + this.mt = mt; + this.materiaList = materiaList; + } + + @Override + public Object call() throws Exception { + + // 开启对应数量的线程 + List materialList = new ArrayList<>(); + for (int i = 0; i < materiaList.size(); i++) { + Material material = materiaList.get(i); + if (Long.compare(material.getMaterialTypeId(), mt.getOldId()) == 0) { + materialList.add(material); + } + } + List objectList = AddMaterialByType(materialList); + Map objectMap = InitTreeMenus(mt, objectList); + return objectMap; + } + } + + + // 构造树形组件数据模板 + public Map InitTreeMenus(MaterialType mt, List children) { + if (mt != null) { + Map map = new HashMap<>(); + map.put("title", mt.getTname()); + map.put("id", mt.getOldId()); + map.put("parentId",mt.getParentId()); + map.put("children", children); + return map; + } else { + return null; + } } + // 在类别后添加物料名称 + public List AddMaterialByType(List materialList) { + List result = new ArrayList<>(); + for (int i = 0; i < materialList.size(); i++) { + Material material = materialList.get(i); + Map map = new HashMap<>(); + String version = material.getVersion(); + if (version == null) { + version = ""; + } + + String title = material.getMname() + ",规格型号： " + version; + map.put("title", title); + map.put("id", material.getId()); + result.add(map); + } + return result; + } + public List buildTree(List list,Long parentId){ + List result = new ArrayList<>(); + for (int i = 0; i < list.size(); i++) { + JSONObject o = new JSONObject((Map)list.get(i)); + Long id = Long.valueOf(o.getString("id")); + Long pid = Long.valueOf(o.getString("parentId")); + if(Long.compare(pid,parentId) == 0){ + result.add(o); + } + + } + return null; + } } diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml index 489a8898..6974d571 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml @@ -245,6 +245,19 @@ + + + + + + + + +