From 3631219246be48aec1e745e94e5b28ff4e8799c8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 19:35:54 +0800
Subject: [PATCH] 调整上海原版接口
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 baeab8f..e560332 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
@@ -4,10 +4,10 @@
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.models.*;
-import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
+
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -290,7 +290,7 @@
args.put("companyId", companyId);
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatus2", InoutConstant.RECORD_STATUS_ERROR);
+ args.put("recordStatus2", "ERROR");
if(StringUtils.isNotEmpty(depotId)){
hql += " and depotId =:depotId";
@@ -435,8 +435,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);
@@ -468,8 +468,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);
@@ -501,8 +501,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);
@@ -721,8 +721,8 @@
* @param endTime
* @return
*/
- public List<MPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
- String hql = " from " + MPlan.class.getName() + " where companyId =:companyId";
+ public List<InoutPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
+ String hql = " from " + InoutPlan.class.getName() + " where companyId =:companyId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", companyId);
@@ -751,9 +751,9 @@
* @param planId
* @return
*/
- public List<MPlanDetail> getPlanDetail(String planId) {
+ public List<InoutPlanDetail> getPlanDetail(String planId) {
- String hql = " from " + MPlanDetail.class.getName() + " where planId =:planId";
+ String hql = " from " + InoutPlanDetail.class.getName() + " where planId =:planId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("planId", planId);
@@ -768,8 +768,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);
@@ -806,7 +806,7 @@
args.put("companyId", companyId);
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatus2", InoutConstant.RECORD_STATUS_ERROR);
+ args.put("recordStatus2", "ERROR");
if(null != startTime){
hql += " and registerTime >:startTime";
--
Gitblit v1.9.3