From 5d6da5dd842088e148c9fd11db329fe75e4b4d12 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期日, 27 八月 2023 13:44:28 +0800
Subject: [PATCH] 优化Modbus-TCP命令发送
---
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5206.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5206.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5206.java
index 5103577..fd176bb 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5206.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5206.java
@@ -5,6 +5,7 @@
import com.ld.igds.constant.FoodVariety;
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.inout.InoutConstant;
+import com.ld.igds.models.Depot;
import com.ld.igds.models.InoutRecord;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
@@ -39,7 +40,7 @@
@Override
public String getInterfaceId() {
- return Phone35Constant.API_PHONE_5203;
+ return Phone35Constant.API_PHONE_5206;
}
@SuppressWarnings("unchecked")
@@ -66,7 +67,7 @@
param.setProgress(InoutConstant.PROGRESS_HANDLE);
List<InoutRecord> list = hPhoneService.listInoutRecord(param);
- if(null == list || list.isEmpty()){
+ if (null == list || list.isEmpty()) {
return PhoneRespUtil.success(null, req);
}
@@ -75,8 +76,12 @@
for (InoutRecord record : list) {
inoutData = new Phone35InoutDto();
BeanUtils.copyProperties(record, inoutData);
- //璁剧疆浠撳簱銆佺伯椋熷搧绉嶃�佺伯椋熺瓑绾х瓑鍚嶇О
- inoutData.setDepotName(phone35Util.getDepotName(phone35AuthUser.getCompanyId(), record.getDepotId()));
+ Depot depot = phone35Util.getDepot(phone35AuthUser.getCompanyId(), record.getDepotId());
+
+ //璁剧疆浠撳簱銆佺伯椋熷搧绉嶃�佺伯椋熺瓑绾с�佷繚绠″憳绛夊悕绉�
+ inoutData.setDepotName(depot.getName());
+ inoutData.setStoreKeeper(depot.getStoreKeeper());
+ inoutData.setStoreKeeperName(depot.getStoreKeeperName());
inoutData.setFoodVarietyName(FoodVariety.getMsg(record.getFoodVariety()));
inoutData.setFoodLevelName(FoodLevel.getMsg(record.getFoodLevel()));
listDto.add(inoutData);
--
Gitblit v1.9.3