From 46766994f2c9a542ad42d5d9a637a7a66f2c265e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 08 七月 2023 16:07:01 +0800
Subject: [PATCH] 弹窗调整
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 036d218..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);
@@ -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