From f68985cc05acf0a1df490da131377848d1b4d9d5 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 28 Sep 2021 08:53:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0(ftp?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F),?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CRollinfoServiceImpl.java    | 133 ++++++++++++------
 .../ftp/controller/SysFtpController.java      |   1 +
 .../pda/service/impl/ReceiptServiceImpl.java  |   2 +-
 3 files changed, 90 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
index d3c60c7..fd0de5b 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
@@ -5,7 +5,9 @@ import com.gaotao.common.utils.QueryList;
 import com.gaotao.modules.finishedProduct.vo.CRollinfoVo;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gaotao.modules.finishedProduct.dao.CRollinfoDao;
 import com.gaotao.modules.finishedProduct.entity.CRollinfoEntity;
@@ -24,124 +26,165 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
         for (QueryList queryList : queryLists) {
             switch (queryList.getQueryAttributes()) {
                 case "rollno":
-                    cRollinfoVo.setRollno(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setRollno(queryList.getQueryValue().toString());
                     break;
                 case "site":
-                    cRollinfoVo.setSite(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setSite(queryList.getQueryValue().toString());
                     break;
                 case "partDescription":
-                    cRollinfoVo.setPartDescription(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setPartDescription(queryList.getQueryValue().toString());
                     break;
                 case "rollqty":
-                    cRollinfoVo.setRollqty(Double.valueOf(queryList.getQueryValue().toString()));
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setRollqty(Double.valueOf(queryList.getQueryValue().toString()));
                     break;
                 case "partno":
-                    cRollinfoVo.setPartno(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setPartno(queryList.getQueryValue().toString());
                     break;
                 case "supplierid":
-                    cRollinfoVo.setSupplierid(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setSupplierid(queryList.getQueryValue().toString());
                     break;
                 case "orderref1":
-                    cRollinfoVo.setOrderref1(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setOrderref1(queryList.getQueryValue().toString());
                     break;
                 case "orderref2":
-                    cRollinfoVo.setOrderref2(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setOrderref2(queryList.getQueryValue().toString());
                     break;
                 case "orderref3":
-                    cRollinfoVo.setOrderref3(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setOrderref3(queryList.getQueryValue().toString());
                     break;
                 case "orderref4":
-                    cRollinfoVo.setOrderref4(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setOrderref4(queryList.getQueryValue().toString());
                     break;
                 case "orderref5":
-                    cRollinfoVo.setOrderref5(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setOrderref5(queryList.getQueryValue().toString());
                     break;
                 case "rolldate":
-                    cRollinfoVo.setRolldate(DateUtils.stringToDate(queryList.getQueryValue().toString(),"yyyy-MM-dd"));
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setRolldate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd"));
                     break;
                 case "createddate":
-                    cRollinfoVo.setCreateddate(DateUtils.stringToDate(queryList.getQueryValue().toString(),"yyyy-MM-dd"));
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setCreateddate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd"));
                     break;
                 case "tatusDb":
-                    cRollinfoVo.setStatusDb(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setStatusDb(queryList.getQueryValue().toString());
                     break;
                 case "status":
-                    cRollinfoVo.setStatus(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setStatus(queryList.getQueryValue().toString());
                     break;
                 case "supprollno":
-                    cRollinfoVo.setSupprollno(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setSupprollno(queryList.getQueryValue().toString());
                     break;
                 case "rollseqno":
-                    cRollinfoVo.setRollseqno(Integer.valueOf(queryList.getQueryValue().toString()));
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setRollseqno(Integer.valueOf(queryList.getQueryValue().toString()));
                     break;
                 case "supprollnoflag":
-                    cRollinfoVo.setSupprollnoflag(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setSupprollnoflag(queryList.getQueryValue().toString());
                     break;
                 case "sourcetype":
-                    cRollinfoVo.setSourcetype(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setSourcetype(queryList.getQueryValue().toString());
                     break;
                 case "originalrollno":
-                    cRollinfoVo.setOriginalrollno(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setOriginalrollno(queryList.getQueryValue().toString());
                     break;
                 case "rolltype":
-                    cRollinfoVo.setRolltype(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setRolltype(queryList.getQueryValue().toString());
                     break;
                 case "rolltypeDb":
-                    cRollinfoVo.setRolltypeDb(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setRolltypeDb(queryList.getQueryValue().toString());
                     break;
                 case "firstlevelrollno":
-                    cRollinfoVo.setFirstlevelrollno(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setFirstlevelrollno(queryList.getQueryValue().toString());
                     break;
                 case "remark":
-                    cRollinfoVo.setRemark(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setRemark(queryList.getQueryValue().toString());
                     break;
                 case "parttypeFlag":
-                    cRollinfoVo.setParttypeFlag(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setParttypeFlag(queryList.getQueryValue().toString());
                     break;
                 case "warehouseid":
-                    cRollinfoVo.setWarehouseid(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setWarehouseid(queryList.getQueryValue().toString());
                     break;
                 case "synchronizedflag":
-                    cRollinfoVo.setSynchronizedflag(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setSynchronizedflag(queryList.getQueryValue().toString());
                     break;
                 case "consumeorderno":
-                    cRollinfoVo.setConsumeorderno(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setConsumeorderno(queryList.getQueryValue().toString());
                     break;
                 case "consumeseqno":
-                    cRollinfoVo.setConsumeseqno(Integer.valueOf(queryList.getQueryValue().toString()));
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setConsumeseqno(Integer.valueOf(queryList.getQueryValue().toString()));
                     break;
                 case "customerid":
-                    cRollinfoVo.setCustomerid(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setCustomerid(queryList.getQueryValue().toString());
                     break;
                 case "fgpartno":
-                    cRollinfoVo.setFgpartno(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setFgpartno(queryList.getQueryValue().toString());
                     break;
                 case "refSupplierid":
-                    cRollinfoVo.setRefSupplierid(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setRefSupplierid(queryList.getQueryValue().toString());
                     break;
                 case "refPartdesc":
-                    cRollinfoVo.setRefPartdesc(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setRefPartdesc(queryList.getQueryValue().toString());
                     break;
                 case "needsynchronizeflag":
-                    cRollinfoVo.setNeedsynchronizeflag(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setNeedsynchronizeflag(queryList.getQueryValue().toString());
                     break;
                 case "opslog":
-                    cRollinfoVo.setOpslog(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setOpslog(queryList.getQueryValue().toString());
                     break;
                 case "frozenflag":
-                    cRollinfoVo.setFrozenflag(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setFrozenflag(queryList.getQueryValue().toString());
                     break;
                 case "frozenby":
-                    cRollinfoVo.setFrozenby(queryList.getQueryValue().toString());
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setFrozenby(queryList.getQueryValue().toString());
                     break;
                 case "expireddate":
-                    cRollinfoVo.setExpireddate(DateUtils.stringToDate(queryList.getQueryValue().toString(),"yyyy-MM-dd") );
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setExpireddate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd"));
                     break;
                 case "manufacturedate":
-                    cRollinfoVo.setManufacturedate(DateUtils.stringToDate(queryList.getQueryValue().toString(),"yyyy-MM-dd"));
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
+                        cRollinfoVo.setManufacturedate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd"));
                     break;
                 case "toexpiredays":
-                    cRollinfoVo.setToexpiredays(Integer.valueOf(queryList.getQueryValue().toString()));
+                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) {
+                        cRollinfoVo.setToexpiredays(Integer.valueOf(queryList.getQueryValue().toString()));
+                    }
                     break;
             }
         }
@@ -151,23 +194,23 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
 
     @Override
     public void updateExpireddate(CRollinfoEntity cRollinfo) {
-        lambdaUpdate().eq(CRollinfoEntity::getRollno,cRollinfo.getRollno())
+        lambdaUpdate().eq(CRollinfoEntity::getRollno, cRollinfo.getRollno())
                 .update(cRollinfo);
     }
 
     @Override
     public CRollinfoEntity infoRollno(CRollinfoEntity rollno) {
         return lambdaQuery()
-                .eq(StringUtils.isNotEmpty(rollno.getRollno()),CRollinfoEntity::getRollno,rollno.getRollno())
-                .eq(StringUtils.isNotEmpty(rollno.getSite()),CRollinfoEntity::getSite,rollno.getSite()).one();
+                .eq(StringUtils.isNotEmpty(rollno.getRollno()), CRollinfoEntity::getRollno, rollno.getRollno())
+                .eq(StringUtils.isNotEmpty(rollno.getSite()), CRollinfoEntity::getSite, rollno.getSite()).one();
     }
 
     @Override
     @Transactional
     public void batchUpdateExpireddate(List<CRollinfoEntity> cRollinfoList) {
         cRollinfoList.forEach(rollInfo -> {
-           lambdaUpdate().set(CRollinfoEntity::getExpireddate,rollInfo.getExpireddate()).eq(CRollinfoEntity::getSite,rollInfo.getSite()).eq(CRollinfoEntity::getRollno,rollInfo.getRollno())
-           .update();
+            lambdaUpdate().set(CRollinfoEntity::getExpireddate, rollInfo.getExpireddate()).eq(CRollinfoEntity::getSite, rollInfo.getSite()).eq(CRollinfoEntity::getRollno, rollInfo.getRollno())
+                    .update();
         });
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java b/src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java
index af9cad6..79d8e8c 100644
--- a/src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java
+++ b/src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java
@@ -73,6 +73,7 @@ public class SysFtpController extends AbstractController {
 			String newFileName = RandomUtil.getOrderNoByAtomic("file")+suffix;
 			File dir = multipartFileToFile(file,newFileName);
 			r = FTPUtils.uploadFtpFile(dir);
+			dir.delete();
 			ossEntity.setUrl(r.get("url").toString());
 			ossEntity.setCreatedBy(user.getUsername());
 			ossEntity.setFileName(fileName);
diff --git a/src/main/java/com/gaotao/modules/pda/service/impl/ReceiptServiceImpl.java b/src/main/java/com/gaotao/modules/pda/service/impl/ReceiptServiceImpl.java
index 6718b3c..74b7016 100644
--- a/src/main/java/com/gaotao/modules/pda/service/impl/ReceiptServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/pda/service/impl/ReceiptServiceImpl.java
@@ -92,7 +92,7 @@ public class ReceiptServiceImpl implements ReceiptService {
 		}
 		//判断供应商是否一致
 		String supplierId = session.getAttribute("supplierId").toString();
-		if(supplierId.equals(rollInfo.getSupplierID())){
+		if(supplierId.equals(rollInfo.getSupplierID()) ){
 			//取值缓存卷号信息
 			Map<String, String> rollNos = (Map<String, String>) session.getAttribute("rollNos");
 			//判断是否多次扫描