From f23f7a18fe8fe3729dfb91af5b55b515b835c7d8 Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期四, 17 八月 2023 17:40:16 +0800 Subject: [PATCH] 问题修改 --- igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java index d5417f8..437a53e 100644 --- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java +++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java @@ -289,7 +289,6 @@ args.put("companyId", companyId); args.put("progress", InoutConstant.PROGRESS_RECORD); args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL); - args.put("recordStatus2", InoutConstant.RECORD_STATUS_ERROR); if(StringUtils.isNotEmpty(depotId)){ hql += " and depotId =:depotId"; @@ -434,8 +433,8 @@ * @param endTime * @return */ - public List<MStockChange> listStockChange(String companyId, String depotId, Date startTime, Date endTime) { - String hql = " from " + MStockChange.class.getName() + " where companyId =:companyId"; + public List<InoutStockChange> listStockChange(String companyId, String depotId, Date startTime, Date endTime) { + String hql = " from " + InoutStockChange.class.getName() + " where companyId =:companyId"; Map<String, Object> args = new HashMap<String, Object>(); args.put("companyId", companyId); @@ -467,8 +466,8 @@ * @param endTime * @return */ - public List<MLossOver> listLossOver(String companyId, String depotId, Date startTime, Date endTime) { - String hql = " from " + MLossOver.class.getName() + " where companyId =:companyId"; + public List<InoutLossOver> listLossOver(String companyId, String depotId, Date startTime, Date endTime) { + String hql = " from " + InoutLossOver.class.getName() + " where companyId =:companyId"; Map<String, Object> args = new HashMap<String, Object>(); args.put("companyId", companyId); @@ -500,8 +499,8 @@ * @param endTime * @return */ - public List<MVarietyChange> listFoodVarietyChange(String companyId, String depotId, Date startTime, Date endTime) { - String hql = " from " + MVarietyChange.class.getName() + " where companyId =:companyId"; + public List<InoutVarietyChange> listFoodVarietyChange(String companyId, String depotId, Date startTime, Date endTime) { + String hql = " from " + InoutVarietyChange.class.getName() + " where companyId =:companyId"; Map<String, Object> args = new HashMap<String, Object>(); args.put("companyId", companyId); @@ -767,8 +766,8 @@ * @param endTime * @return */ - public List<MContract> listContract(String companyId, Date startTime, Date endTime){ - String hql = " from " + MContract.class.getName() + " where companyId =:companyId"; + public List<InoutContract> listContract(String companyId, Date startTime, Date endTime){ + String hql = " from " + InoutContract.class.getName() + " where companyId =:companyId"; Map<String, Object> args = new HashMap<String, Object>(); args.put("companyId", companyId); @@ -805,7 +804,6 @@ args.put("companyId", companyId); args.put("progress", InoutConstant.PROGRESS_RECORD); args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL); - args.put("recordStatus2", InoutConstant.RECORD_STATUS_ERROR); if(null != startTime){ hql += " and registerTime >:startTime"; -- Gitblit v1.9.3