From 9d1eb684e0b0a3f6a9107db3cc64fc782989a654 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 11 七月 2023 09:00:02 +0800
Subject: [PATCH] App读卡问题解决
---
igds-web/src/main/resources/templates/admin/inout/out-card-back.html | 6 ------
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 6 ++++--
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java | 2 +-
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 1 +
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5202.java | 1 +
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 2 +-
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5201.java | 2 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5205.java | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
index b1f910a..8ab552a 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
@@ -163,7 +163,7 @@
hql += " and intelCard =:intelCard";
args.put("intelCard", intelCard);
}
- hql += " order by registerTime";
+ hql += " order by registerTime desc";
List<InoutRecord> list = this.query(hql, args);
if (null == list || list.isEmpty()) {
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5201.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5201.java
index 0697545..0ad7d16 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5201.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5201.java
@@ -16,6 +16,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.Date;
/**
@@ -54,6 +55,7 @@
//璋冪敤鍏ュ簱涓嬩竴娴佺▼
InoutData data = new InoutData();
data.setUserName(param.getUserName());
+ data.setIntelCard(param.getIntelCard());
data.setUserId(param.getUserId());
data.setUserContact(param.getUserContact());
data.setPlateNum(param.getPlateNum());
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5202.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5202.java
index 494b886..7f5d5d6 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5202.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5202.java
@@ -55,6 +55,7 @@
//璋冪敤鍑哄簱涓嬩竴娴佺▼
InoutData data = new InoutData();
data.setUserName(param.getUserName());
+ data.setIntelCard(param.getIntelCard());
data.setUserId(param.getUserId());
data.setUserContact(param.getUserContact());
data.setPlateNum(param.getPlateNum());
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5205.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5205.java
index 517f6dc..26145fb 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5205.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5205.java
@@ -79,7 +79,7 @@
if (listProgress != null && !listProgress.isEmpty()) {
for (InoutData inoutData : listProgress) {
phone35InoutDto = new Phone35InoutDto();
- BeanUtils.copyProperties(inoutData, inoutData);
+ BeanUtils.copyProperties(inoutData, phone35InoutDto);
if (InoutConstant.TYPE_IN.equals(inoutData.getType())) {
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 466a756..2871e07 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -367,8 +367,9 @@
if (null != msg) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
}
-
-
+ data.setCompleteTime(param.getCompleteTime());
+ data.setProgress(InoutConstant.PROGRESS_RECORD);
+ inoutService.updateInoutCache(data);
// 娴佺▼瀹屾垚鏀朵簨浠�
inoutEventControl.onInoutComplete(data);
@@ -862,6 +863,7 @@
curData.setRemarks(data.getRemarks());
curData.setCheckItems(data.getCheckItems());
curData.setCheckTime(data.getCheckTime());
+ curData.setDepotId(data.getDepotId());
if (StringUtils.isEmpty(data.getCheckUser())) {
curData.setCheckUser(ContextUtil.getLoginUserCName());
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index 73cbf90..58e3093 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -292,7 +292,7 @@
}
// 娓呴櫎缂撳瓨
- this.delFromCache(param.getDeptId(), param.getType(), param.getId());
+// this.delFromCache(param.getDeptId(), param.getType(), param.getId());
inoutMapper.toComplete(param);
diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
index 9cae37b..29ed5d6 100644
--- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -79,6 +79,7 @@
CHECK_ID_ as checkId,
CHECK_STATUS_ AS checkStatus,
REMARKS_ AS remarks,
+ FOOD_YEAR_ AS foodYear,
IF(ISNULL(SAMPLE_TIME_),'NONE','SAMPLE') AS sampleStatus
from
D_INOUT_RECORD
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-card-back.html b/igds-web/src/main/resources/templates/admin/inout/out-card-back.html
index a2c3fb0..a660a6a 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-card-back.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-card-back.html
@@ -325,12 +325,6 @@
</div>
</div>
- <div class="rkbk-quick layui-text-center">
- <button class="rkbk-quick-btn layui-btn btn-green" type='button'
- onclick="submit()">
- <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 鍑哄簱鏀跺崱
- </button>
- </div>
</form>
</div>
</div>
--
Gitblit v1.9.3