From 693be588a543a3049aef4e12710cb87caaccd6bf Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 28 Oct 2022 16:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DepositoryController.java | 188 ++++++++-------- .../mapper/DepositoryRecordMapper.xml | 16 +- .../mapper/MaterialTypeMapper.java | 7 + .../mapper/MaterialTypeMapper.xml | 8 + .../impl/DepositoryRecordServiceImpl.java | 42 +++- .../service/impl/DepositoryServiceImpl.java | 213 ++++++++++-------- .../templates/pages/chart/chart-in_back.html | 34 +-- .../templates/pages/chart/chart-out_back.html | 44 ++-- .../pages/chart/chart-stock_back.html | 35 +-- .../dreamchaser/depository_manage/Test.java | 34 +-- .../mapper/DepositoryRecordMapper.xml | 16 +- .../mapper/MaterialTypeMapper.xml | 8 + .../templates/pages/chart/chart-out_back.html | 44 ++-- .../pages/chart/chart-stock_back.html | 35 +-- 14 files changed, 375 insertions(+), 349 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index e3fcbac7..13e1e8d6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -230,7 +230,7 @@ public class DepositoryController { * @param depositoryRecordService * @return */ - public static List getBeforeInventoryByMonth(DepositoryService depositoryService, DepositoryRecordService depositoryRecordService,UserByPort userByPort) { + public static List getBeforeInventoryByMonth(DepositoryService depositoryService, DepositoryRecordService depositoryRecordService, UserByPort userByPort) { // List depositoryAll = depositoryService.findDepositoryAll(); List depositoryAll = depositoryService.findDepositoryByAdminorgAndUser(userByPort); // List depositoryAll = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString()); @@ -304,7 +304,7 @@ public class DepositoryController { * @param depositoryRecordService * @return */ - public static Map getBeforeInventoryOnMap(DepositoryService depositoryService, DepositoryRecordService depositoryRecordService,UserByPort userByPort) { + public static Map getBeforeInventoryOnMap(DepositoryService depositoryService, DepositoryRecordService depositoryRecordService, UserByPort userByPort) { // 中国地图数据 // ['product', '3月', '4月', '5月', '6月', '7月', '8月'], // ['电子产品类', 41.1, 30.4, 65.1, 53.3, 83.8, 98.7], @@ -374,12 +374,12 @@ public class DepositoryController { * @return */ @GetMapping("/warehouseRecord") - public RestResponse findDepositoryRecordByCondition(@RequestParam Map map,HttpServletRequest request) { + public RestResponse findDepositoryRecordByCondition(@RequestParam Map map, HttpServletRequest request) { UserByPort userByPort = (UserByPort) request.getAttribute("userToken"); - List list = depositoryService.findDepositoryRecordPByCondition(map,userByPort); + List list = depositoryService.findDepositoryRecordPByCondition(map, userByPort); for (int i = 0; i < list.size(); i++) { Depository depository = list.get(i); - Administration company = PageController.getCompany(depository.getCid(),userByPort); + Administration company = PageController.getCompany(depository.getCid(), userByPort); list.get(i).setCname(company.getName()); } return new RestResponse(list, depositoryService.findCountByCondition(map), 200); @@ -392,12 +392,12 @@ public class DepositoryController { * @return */ @GetMapping("/allWarehouseByParent") - public RestResponse findDepositoryByNoParent(@RequestParam Map map,HttpServletRequest request) { + public RestResponse findDepositoryByNoParent(@RequestParam Map map, HttpServletRequest request) { UserByPort userByPort = (UserByPort) request.getAttribute("userToken"); if ("".equals(map.get("parentId")) || map.get("parentId") == null) { map.put("parentId", 0); } - List list = depositoryService.findDepositoryRecordPByCondition(map,userByPort); + List list = depositoryService.findDepositoryRecordPByCondition(map, userByPort); // 获取所有行政单位 Map administration = findAdministration(userByPort); List administrationPList = (List) administration.get("administrationPList"); @@ -429,7 +429,7 @@ public class DepositoryController { 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(); } @@ -459,14 +459,14 @@ public class DepositoryController { * @return */ @PostMapping("/realDeleteDepository") - public RestResponse realDeleteDepository(@RequestBody Map map,HttpServletRequest request) { + public RestResponse realDeleteDepository(@RequestBody Map map, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); if (map.containsKey("id")) { Integer id = ObjectFormatUtil.toInteger(map.get("id")); new Thread(new Runnable() { @Override public void run() { - RealDeleteSonDepository(id.toString(),userToken); + RealDeleteSonDepository(id.toString(), userToken); } }).start(); return CrudUtil.deleteHandle(depositoryService.deleteDepositoryRecordById(id), 1); @@ -477,7 +477,7 @@ public class DepositoryController { new Thread(new Runnable() { @Override public void run() { - RealDeleteSonDepository(id,userToken); + RealDeleteSonDepository(id, userToken); } }).start(); } @@ -492,14 +492,14 @@ public class DepositoryController { * * @param parentId */ - public void RealDeleteSonDepository(String parentId,UserByPort userByPort) { + public void RealDeleteSonDepository(String parentId, UserByPort userByPort) { Map param = new HashMap<>(); param.put("parentId", parentId); // 获取当前仓库所有子仓库 - List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param,userByPort); + List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param, userByPort); for (int i = 0; i < depositoryRecordPByCondition.size(); i++) { Integer id = depositoryRecordPByCondition.get(i).getId(); // 获取当前仓库id - RealDeleteSonDepository(id.toString(),userByPort); // 递归查询仓库 + RealDeleteSonDepository(id.toString(), userByPort); // 递归查询仓库 depositoryService.deleteDepositoryRecordById(id); // 删除仓库 } } @@ -511,9 +511,9 @@ public class DepositoryController { * @return */ @PostMapping("/depository") - public RestResponse insertDepository(@RequestBody Map map,HttpServletRequest request) { + public RestResponse insertDepository(@RequestBody Map map, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); - return CrudUtil.postHandle(depositoryService.insertDepository(map,userToken), 1); + return CrudUtil.postHandle(depositoryService.insertDepository(map, userToken), 1); } /** @@ -523,7 +523,7 @@ public class DepositoryController { * @return */ @PostMapping("/depository_del") - public RestResponse deleteDepository(@RequestBody Map map,HttpServletRequest request) { + public RestResponse deleteDepository(@RequestBody Map map, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); if (map.containsKey("id")) { Integer id = ObjectFormatUtil.toInteger(map.get("id")); @@ -531,7 +531,7 @@ public class DepositoryController { new Thread(new Runnable() { @Override public void run() { - UpdateSonState(id.toString(), 3, true,userToken); + UpdateSonState(id.toString(), 3, true, userToken); } }).start(); return CrudUtil.deleteHandle(depositoryService.changeStateToDeletedById(id), 1); @@ -543,7 +543,7 @@ public class DepositoryController { new Thread(new Runnable() { @Override public void run() { - UpdateSonState(id, 3, true,userToken); + UpdateSonState(id, 3, true, userToken); } }).start(); } @@ -576,7 +576,7 @@ public class DepositoryController { * @return */ @PostMapping("/EditDepositoryState") - public RestResponse EditDepositoryState(@RequestBody Map map,HttpServletRequest request) { + public RestResponse EditDepositoryState(@RequestBody Map map, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); if (map.containsKey("state")) { map.put("state", 1); @@ -591,7 +591,7 @@ public class DepositoryController { new Thread(new Runnable() { @Override public void run() { - UpdateSonState(id, state, true,userToken); + UpdateSonState(id, state, true, userToken); } }).start(); } else { @@ -599,7 +599,7 @@ public class DepositoryController { new Thread(new Runnable() { @Override public void run() { - UpdateSonState(id, state, false,userToken); + UpdateSonState(id, state, false, userToken); } }).start(); } @@ -619,11 +619,11 @@ public class DepositoryController { * * @param parentId */ - public void UpdateSonState(String parentId, Integer state, boolean envelop,UserByPort userToken) { + public void UpdateSonState(String parentId, Integer state, boolean envelop, UserByPort userToken) { Map param = new HashMap<>(); param.put("parentId", parentId); // 获取当前仓库所有子仓库 - List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param,userToken); + List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param, userToken); if (envelop) { // 将当前仓库下的产品状态改为禁用 UpdateSonMaterialState(parentId, state); @@ -633,7 +633,7 @@ public class DepositoryController { int depositoryId = depository.getId(); Map newMap = new HashMap<>(); newMap.put("parentId", depositoryId); - UpdateSonState(String.valueOf(depositoryId), state, envelop,userToken); + UpdateSonState(String.valueOf(depositoryId), state, envelop, userToken); Map map = new HashMap<>(); map.put("id", depositoryId); map.put("state", state); @@ -756,7 +756,7 @@ public class DepositoryController { drCountbyDrName.clear(); } - Map depository_data = new HashMap<>(); + Map depository_data = new HashMap<>(); depository_data.put("data", show_data); return depository_data; } @@ -864,7 +864,7 @@ public class DepositoryController { } } - Map depository_data = new HashMap<>(); + Map depository_data = new HashMap<>(); depository_data.put("data", show_data); return depository_data; } @@ -1032,56 +1032,64 @@ public class DepositoryController { // 中国地图数据 // ['product', '3月', '4月', '5月', '6月', '7月', '8月'], // ['电子产品类', 41.1, 30.4, 65.1, 53.3, 83.8, 98.7], - Map mapData = new HashMap<>(); - List mapDataList = new ArrayList<>(); - Map previousMonth1 = getPreviousMonth(); - List months1 = (List) previousMonth1.get("months"); - List sourceList1 = (List) previousMonth1.get("sourceList"); - ArrayList title = new ArrayList<>(); - title.add("product"); - for (int i = sourceList1.size() - 1; i >= 0; i--) { - title.add(((Map) sourceList1.get(i)).get("month")); - } - mapDataList.add(title); - for (int i = 0; i < materialTypeAll.size(); i++) { - List productData = new ArrayList<>(); - productData.add(materialTypeAll.get(i).getTname()); - for (int j = months1.size() - 1; j > 0; j--) { - Map parm = new HashMap<>(); - parm.put("type", Integer.parseInt(type)); - if (Integer.parseInt(type) == 1) { - parm.put("state", "已入库"); - } else if (Integer.parseInt(type) == 2) { - parm.put("state", "已出库"); + Map mapData = new HashMap<>(); + if (!"0".equals(type)) { + List mapDataList = new ArrayList<>(); + Map previousMonth1 = getPreviousMonth(); + List months1 = (List) previousMonth1.get("months"); + List sourceList1 = (List) previousMonth1.get("sourceList"); + ArrayList title = new ArrayList<>(); + title.add("product"); + + for (int i = sourceList1.size() - 1; i >= 0; i--) { + title.add(((Map) sourceList1.get(i)).get("month")); + } + mapDataList.add(title); + for (int i = 0; i < materialTypeAll.size(); i++) { + List productData = new ArrayList<>(); + productData.add(materialTypeAll.get(i).getTname()); + for (int j = months1.size() - 1; j > 0; j--) { + Map parm = new HashMap<>(); + parm.put("type", Integer.parseInt(type)); + if (Integer.parseInt(type) == 1) { + parm.put("state", "已入库"); + } else if (Integer.parseInt(type) == 2) { + parm.put("state", "已出库"); + } + parm.put("start", months1.get(j)); + parm.put("end", months1.get(j - 1)); + parm.put("tname", materialTypeAll.get(i).getTname()); + //根据条件获取月份中物料的总额 + // 测试 + Double materialCountByMonth1 = depositoryRecordService.findMaterialCountByMonth1(parm); + productData.add(materialCountByMonth1); } - parm.put("start", months1.get(j)); - parm.put("end", months1.get(j - 1)); - parm.put("tname", materialTypeAll.get(i).getTname()); - //根据条件获取月份中物料的总额 - // 测试 - Double materialCountByMonth1 = depositoryRecordService.findMaterialCountByMonth1(parm); - productData.add(materialCountByMonth1); + mapDataList.add(((ArrayList) productData).clone()); + productData.clear(); } - mapDataList.add(((ArrayList) productData).clone()); - productData.clear(); - } - - mapData.put("mapDataList", mapDataList); + mapData.put("mapDataList", mapDataList); + } // 封装 展示数据 Map depository_data = new LinkedHashMap(); // 构造对应格式 depository_data.put("week", show_weekday); depository_data.put("data", show_data); - depository_data.put("yesterdayData", yesterdayData); - depository_data.put("todayInventory", todayInventory); depository_data.put("sourceList", sourceList); - depository_data.put("mapData", mapData); - depository_data.put("sourceListByMonth", getBeforeInventoryByMonth(depositoryService, depositoryRecordService,userByPort)); - depository_data.put("BeforeInventory", getBeforeInventoryByDName(depositoryService, depositoryRecordService, userByPort)); - depository_data.put("ThisWeekInventory", getThisWeekInventoryByDName(depositoryService, depositoryRecordService, userByPort)); - depository_data.put("MapInventory", getBeforeInventoryOnMap(depositoryService, depositoryRecordService,userByPort)); + // 获取库存图 + if ("0".equals(type)) { + // 如果是获取库存 + depository_data.put("todayInventory", todayInventory); + depository_data.put("sourceListByMonth", getBeforeInventoryByMonth(depositoryService, depositoryRecordService, userByPort)); + depository_data.put("ThisWeekInventory", getThisWeekInventoryByDName(depositoryService, depositoryRecordService, userByPort)); + depository_data.put("BeforeInventory", getBeforeInventoryByDName(depositoryService, depositoryRecordService, userByPort)); + depository_data.put("MapInventory", getBeforeInventoryOnMap(depositoryService, depositoryRecordService, userByPort)); + } else { + // 如果不是 + depository_data.put("yesterdayData", yesterdayData); + depository_data.put("mapData", mapData); + } // 封装 最终数据 Map data = new LinkedHashMap(); data.put("depository_data", depository_data); @@ -1102,12 +1110,12 @@ public class DepositoryController { * @return */ @GetMapping("/find_depository") - public RestResponse FindDepositoryByMid(@RequestParam("mid") String mid,HttpServletRequest request) { + public RestResponse FindDepositoryByMid(@RequestParam("mid") String mid, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); Material materialById = materialService.findMaterialById(Integer.parseInt(mid)); Map param = new HashMap<>(); param.put("depositoryId", materialById.getDepositoryId()); - List depositoryId = depositoryService.findDepositoryRecordPByCondition(param,userToken); + List depositoryId = depositoryService.findDepositoryRecordPByCondition(param, userToken); return new RestResponse(depositoryId.get(0), 1, 200); } @@ -1130,9 +1138,9 @@ public class DepositoryController { * @return */ @GetMapping("/findMaterialByDepository") - public RestResponse FindMaterialByDepository(@RequestParam("depositoryId") String depositoryId,HttpServletRequest request) { + public RestResponse FindMaterialByDepository(@RequestParam("depositoryId") String depositoryId, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); - Boolean allSonDepository = findAllSonDepository(depositoryId,userToken); + Boolean allSonDepository = findAllSonDepository(depositoryId, userToken); return new RestResponse(allSonDepository); } @@ -1143,15 +1151,15 @@ public class DepositoryController { * @return */ @PostMapping("/findRelevancyByDepository") - public RestResponse FindRelevancyByDepository(@RequestBody Map map,HttpServletRequest request) { + public RestResponse FindRelevancyByDepository(@RequestBody Map map, HttpServletRequest request) { Boolean allSonDepositoryOfRelevancy = false; if (map.containsKey("id")) { Integer depositoryId = (Integer) map.get("id"); - allSonDepositoryOfRelevancy = findAllSonDepositoryOfRelevancy(depositoryId.toString(),request); + allSonDepositoryOfRelevancy = findAllSonDepositoryOfRelevancy(depositoryId.toString(), request); } else if (map.containsKey("ids")) { List ids = (List) map.get("ids"); for (int i = 0; i < ids.size(); i++) { - allSonDepositoryOfRelevancy |= findAllSonDepositoryOfRelevancy(ids.get(i).toString(),request); + allSonDepositoryOfRelevancy |= findAllSonDepositoryOfRelevancy(ids.get(i).toString(), request); if (allSonDepositoryOfRelevancy) { break; } @@ -1168,7 +1176,7 @@ public class DepositoryController { * @param parentid * @return */ - public Boolean findAllSonDepository(String parentid,UserByPort userToken) { + public Boolean findAllSonDepository(String parentid, UserByPort userToken) { Map param = new HashMap<>(); param.put("parentId", parentid); param.put("state", 1); @@ -1176,10 +1184,10 @@ public class DepositoryController { if (materialByDepository) { return true; } - List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param,userToken); + List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param, userToken); for (int i = 0; i < depositoryRecordPByCondition.size(); i++) { if (!findMaterialByDepository(depositoryRecordPByCondition.get(i).getId().toString())) { - findAllSonDepository(depositoryRecordPByCondition.get(i).getId().toString(),userToken); + findAllSonDepository(depositoryRecordPByCondition.get(i).getId().toString(), userToken); } else { return true; } @@ -1193,21 +1201,21 @@ public class DepositoryController { * @param parentid * @return */ - public Boolean findAllSonDepositoryOfRelevancy(String parentid,HttpServletRequest request) { + public Boolean findAllSonDepositoryOfRelevancy(String parentid, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); Map param = new HashMap<>(); param.put("parentId", parentid); param.put("state", 1); boolean materialByDepository = findMaterialByDepository(parentid); - Boolean depositoryRecord = findDepositoryRecord(parentid,request); + Boolean depositoryRecord = findDepositoryRecord(parentid, request); if (materialByDepository || depositoryRecord) { return true; } - List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param,userToken); + List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param, userToken); for (int i = 0; i < depositoryRecordPByCondition.size(); i++) { String depositoryId = depositoryRecordPByCondition.get(i).getId().toString(); - if (!findMaterialByDepository(depositoryId) && !findDepositoryRecord(depositoryId,request)) { - findAllSonDepositoryOfRelevancy(depositoryRecordPByCondition.get(i).getId().toString(),request); + if (!findMaterialByDepository(depositoryId) && !findDepositoryRecord(depositoryId, request)) { + findAllSonDepositoryOfRelevancy(depositoryRecordPByCondition.get(i).getId().toString(), request); } else { return true; } @@ -1238,10 +1246,10 @@ public class DepositoryController { * @param depositoryId * @return */ - public Boolean findDepositoryRecord(String depositoryId,HttpServletRequest request) { + public Boolean findDepositoryRecord(String depositoryId, HttpServletRequest request) { Map param = new HashMap<>(); param.put("depositoryId", depositoryId); - List recordPByCondition = depositoryRecordService.findDepositoryRecordPByCondition(param,request); + List recordPByCondition = depositoryRecordService.findDepositoryRecordPByCondition(param, request); if (recordPByCondition.size() > 0) { return true; } @@ -1255,21 +1263,21 @@ public class DepositoryController { * @return */ @GetMapping("/findDepositoryByParent") - public RestResponse FindDepositoryByParentId(@RequestParam("parentId") String parentId,HttpServletRequest request) { + public RestResponse FindDepositoryByParentId(@RequestParam("parentId") String parentId, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); Map param = new HashMap<>(); param.put("parentId", parentId); - List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param,userToken); + List depositoryRecordPByCondition = depositoryService.findDepositoryRecordPByCondition(param, userToken); return new RestResponse(depositoryRecordPByCondition, depositoryService.findCountByCondition(param), 200); } @GetMapping("/findManagerByDid") - public RestResponse FindManagerByDid(@RequestParam("did") Integer did,HttpServletRequest request) { + public RestResponse FindManagerByDid(@RequestParam("did") Integer did, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); List userIdByDid = roleService.findUserIdByDid(did); List userByPortList = new ArrayList<>(); for (int i = 0; i < userIdByDid.size(); i++) { - UserByPort userByPort = PageController.FindUserById(userIdByDid.get(i),userToken); + UserByPort userByPort = PageController.FindUserById(userIdByDid.get(i), userToken); userByPortList.add(userByPort); } return new RestResponse(userByPortList, userByPortList.size(), 200); @@ -1277,9 +1285,9 @@ public class DepositoryController { @GetMapping("/findPostByCompany") - public RestResponse findPostByCompany(@RequestParam("company") String company,HttpServletRequest request) { + public RestResponse findPostByCompany(@RequestParam("company") String company, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); - List administrationPList = PageController.findCompanyBySuperior(company,userToken); + List administrationPList = PageController.findCompanyBySuperior(company, userToken); int size = administrationPList.size(); return new RestResponse(administrationPList, size, 200); } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index c25cf696..79de4524 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -1077,7 +1077,14 @@ and depositoryId = #{depositoryId} - and aorstate = #{state} + + + and aormcheckId is not null + + + and aorstate = #{state} + + and depositoryManagerTime between #{start} and #{end} @@ -1122,7 +1129,12 @@ from applicationoutrecordinfo where 1 = 1 - and aorstate = #{state} + + and aormcheckId is not null + + + and aorstate = #{state} + and depositoryId = #{depository_id} diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java index 9c219ad0..62a7174c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java @@ -112,4 +112,11 @@ public interface MaterialTypeMapper { */ List findMaterialTypeNoParent(); + /** + * 根据父级获取所有类别 + * @param parentId + * @return + */ + List findMaterialTypeByParent(Integer parentId); + } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml index 59bb6df4..28e33d94 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml @@ -79,6 +79,14 @@ FROM material_type mt WHERE mt.id = #{id} + + + @@ -1122,7 +1129,12 @@ from applicationoutrecordinfo where 1 = 1 - and aorstate = #{state} + + and aormcheckId is not null + + + and aorstate = #{state} + and depositoryId = #{depository_id} diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml index 59bb6df4..28e33d94 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml @@ -79,6 +79,14 @@ FROM material_type mt WHERE mt.id = #{id} + + +