From a8da7c463224b9a5bc4628197afe4d9f7d05361c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 15 六月 2023 19:30:40 +0800
Subject: [PATCH] 出入库调试
---
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java
index fd3a5d9..301c738 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java
@@ -43,7 +43,7 @@
@Override
public String getInterfaceId() {
- return Phone35Constant.API_PHONE_5205;
+ return Phone35Constant.API_PHONE_5208;
}
@SuppressWarnings("unchecked")
@@ -57,14 +57,14 @@
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
//鍙傛暟楠岃瘉
- if (StringUtils.isEmpty(param.getDeptId())) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
- }
+// if (StringUtils.isEmpty(param.getDeptId())) {
+// return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+// }
//鏌ヨ娴佹按鏁版嵁淇℃伅
InoutRecord inoutData = hPhoneService.getInoutRecord(phone35AuthUser.getCompanyId(), phone35AuthUser.getDeptId(), param.getId(), param.getIntelCard());
- if(inoutData == null){
- if(StringUtils.isEmpty(param.getId())){
+ if (inoutData == null) {
+ if (StringUtils.isEmpty(param.getId())) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鏈煡璇㈠埌姝ゅ崱鏁版嵁淇℃伅锛岃閲嶈瘯锛侊紒");
}
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鏈幏鍙栧埌鎵�閫夋暟鎹俊鎭紝璇烽噸璇曪紒锛�");
@@ -72,28 +72,28 @@
//灏佽鍝嶅簲鏁版嵁
Phone35InoutDto inoutHandle = new Phone35InoutDto();
BeanUtils.copyProperties(inoutData, inoutHandle);
- inoutHandle.setDepotName(phone35Util.getDepotName(inoutData.getCompanyId(),inoutData.getDepotId()));
+ inoutHandle.setDepotName(phone35Util.getDepotName(inoutData.getCompanyId(), inoutData.getDepotId()));
inoutHandle.setProgressName(phone35Util.getProgressName(phone35AuthUser.getCompanyId(), inoutData.getProgress()));
inoutHandle.setFoodVarietyName(FoodVariety.getMsg(inoutData.getFoodVariety()));
inoutHandle.setFoodLevelName(FoodLevel.getMsg(inoutData.getFoodLevel()));
-// inoutHandle.setHandleStart(inoutData.getHandleStart()); TODO
-// inoutHandle.setHandelEnd(inoutData.getHandleEnd()); TODO
+// inoutHandle.setHandleStart(inoutData.getHandleStart());
+// inoutHandle.setHandelEnd(inoutData.getHandleEnd());
inoutHandle.setProgress(inoutData.getProgress());
//鏍规嵁娴佹按id銆佺粍缁囩紪鐮佹煡璇㈠浘鐗囦俊鎭�
List<FileData> files = fileService.listFile(phone35AuthUser.getCompanyId(), inoutData.getId());
- if(files != null){
+ if (files != null) {
String bathPath;
int i = 1;
for (FileData file : files) {
//鍙缃�间粨鐨勫浘鐗�
- if(file.getBizTag().equals(InoutConstant.PROGRESS_HANDLE)){
- if(i==1){
+ if (file.getBizTag().equals(InoutConstant.PROGRESS_HANDLE)) {
+ if (i == 1) {
i++;
bathPath = fileService.getInoutFilePath(file.getCreateTime());
inoutHandle.setFileName1(file.getFileName());
inoutHandle.setBase64Img1(FfmpegUtil.getImgStr(bathPath + file.getFileName()));
- }else {
+ } else {
bathPath = fileService.getInoutFilePath(file.getCreateTime());
inoutHandle.setFileName2(file.getFileName());
inoutHandle.setBase64Img2(FfmpegUtil.getImgStr(bathPath + file.getFileName()));
--
Gitblit v1.9.3