From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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..6522c87 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
@@ -434,8 +434,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 +467,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 +500,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 +767,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);
--
Gitblit v1.9.3