wilson
/
rongxing-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

文件上传(ftp模式),

master
[li_she] 5 years ago
parent
fd16d543a8
commit
f68985cc05
3 changed files with 90 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 133
      src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
  2. 1
      src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java
  3. 2
      src/main/java/com/gaotao/modules/pda/service/impl/ReceiptServiceImpl.java

133
src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
View File

@ -5,7 +5,9 @@ import com.gaotao.common.utils.QueryList;
import com.gaotao.modules.finishedProduct.vo.CRollinfoVo; import com.gaotao.modules.finishedProduct.vo.CRollinfoVo;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gaotao.modules.finishedProduct.dao.CRollinfoDao; import com.gaotao.modules.finishedProduct.dao.CRollinfoDao;
import com.gaotao.modules.finishedProduct.entity.CRollinfoEntity; import com.gaotao.modules.finishedProduct.entity.CRollinfoEntity;
@ -24,124 +26,165 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
for (QueryList queryList : queryLists) { for (QueryList queryList : queryLists) {
switch (queryList.getQueryAttributes()) { switch (queryList.getQueryAttributes()) {
case "rollno": case "rollno":
cRollinfoVo.setRollno(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setRollno(queryList.getQueryValue().toString());
break; break;
case "site": case "site":
cRollinfoVo.setSite(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setSite(queryList.getQueryValue().toString());
break; break;
case "partDescription": case "partDescription":
cRollinfoVo.setPartDescription(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setPartDescription(queryList.getQueryValue().toString());
break; break;
case "rollqty": case "rollqty":
cRollinfoVo.setRollqty(Double.valueOf(queryList.getQueryValue().toString()));
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setRollqty(Double.valueOf(queryList.getQueryValue().toString()));
break; break;
case "partno": case "partno":
cRollinfoVo.setPartno(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setPartno(queryList.getQueryValue().toString());
break; break;
case "supplierid": case "supplierid":
cRollinfoVo.setSupplierid(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setSupplierid(queryList.getQueryValue().toString());
break; break;
case "orderref1": case "orderref1":
cRollinfoVo.setOrderref1(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setOrderref1(queryList.getQueryValue().toString());
break; break;
case "orderref2": case "orderref2":
cRollinfoVo.setOrderref2(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setOrderref2(queryList.getQueryValue().toString());
break; break;
case "orderref3": case "orderref3":
cRollinfoVo.setOrderref3(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setOrderref3(queryList.getQueryValue().toString());
break; break;
case "orderref4": case "orderref4":
cRollinfoVo.setOrderref4(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setOrderref4(queryList.getQueryValue().toString());
break; break;
case "orderref5": case "orderref5":
cRollinfoVo.setOrderref5(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setOrderref5(queryList.getQueryValue().toString());
break; break;
case "rolldate": 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; break;
case "createddate": 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; break;
case "tatusDb": case "tatusDb":
cRollinfoVo.setStatusDb(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setStatusDb(queryList.getQueryValue().toString());
break; break;
case "status": case "status":
cRollinfoVo.setStatus(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setStatus(queryList.getQueryValue().toString());
break; break;
case "supprollno": case "supprollno":
cRollinfoVo.setSupprollno(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setSupprollno(queryList.getQueryValue().toString());
break; break;
case "rollseqno": case "rollseqno":
cRollinfoVo.setRollseqno(Integer.valueOf(queryList.getQueryValue().toString()));
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setRollseqno(Integer.valueOf(queryList.getQueryValue().toString()));
break; break;
case "supprollnoflag": case "supprollnoflag":
cRollinfoVo.setSupprollnoflag(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setSupprollnoflag(queryList.getQueryValue().toString());
break; break;
case "sourcetype": case "sourcetype":
cRollinfoVo.setSourcetype(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setSourcetype(queryList.getQueryValue().toString());
break; break;
case "originalrollno": case "originalrollno":
cRollinfoVo.setOriginalrollno(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setOriginalrollno(queryList.getQueryValue().toString());
break; break;
case "rolltype": case "rolltype":
cRollinfoVo.setRolltype(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setRolltype(queryList.getQueryValue().toString());
break; break;
case "rolltypeDb": case "rolltypeDb":
cRollinfoVo.setRolltypeDb(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setRolltypeDb(queryList.getQueryValue().toString());
break; break;
case "firstlevelrollno": case "firstlevelrollno":
cRollinfoVo.setFirstlevelrollno(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setFirstlevelrollno(queryList.getQueryValue().toString());
break; break;
case "remark": case "remark":
cRollinfoVo.setRemark(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setRemark(queryList.getQueryValue().toString());
break; break;
case "parttypeFlag": case "parttypeFlag":
cRollinfoVo.setParttypeFlag(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setParttypeFlag(queryList.getQueryValue().toString());
break; break;
case "warehouseid": case "warehouseid":
cRollinfoVo.setWarehouseid(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setWarehouseid(queryList.getQueryValue().toString());
break; break;
case "synchronizedflag": case "synchronizedflag":
cRollinfoVo.setSynchronizedflag(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setSynchronizedflag(queryList.getQueryValue().toString());
break; break;
case "consumeorderno": case "consumeorderno":
cRollinfoVo.setConsumeorderno(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setConsumeorderno(queryList.getQueryValue().toString());
break; break;
case "consumeseqno": case "consumeseqno":
cRollinfoVo.setConsumeseqno(Integer.valueOf(queryList.getQueryValue().toString()));
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setConsumeseqno(Integer.valueOf(queryList.getQueryValue().toString()));
break; break;
case "customerid": case "customerid":
cRollinfoVo.setCustomerid(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setCustomerid(queryList.getQueryValue().toString());
break; break;
case "fgpartno": case "fgpartno":
cRollinfoVo.setFgpartno(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setFgpartno(queryList.getQueryValue().toString());
break; break;
case "refSupplierid": case "refSupplierid":
cRollinfoVo.setRefSupplierid(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setRefSupplierid(queryList.getQueryValue().toString());
break; break;
case "refPartdesc": case "refPartdesc":
cRollinfoVo.setRefPartdesc(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setRefPartdesc(queryList.getQueryValue().toString());
break; break;
case "needsynchronizeflag": case "needsynchronizeflag":
cRollinfoVo.setNeedsynchronizeflag(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setNeedsynchronizeflag(queryList.getQueryValue().toString());
break; break;
case "opslog": case "opslog":
cRollinfoVo.setOpslog(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setOpslog(queryList.getQueryValue().toString());
break; break;
case "frozenflag": case "frozenflag":
cRollinfoVo.setFrozenflag(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setFrozenflag(queryList.getQueryValue().toString());
break; break;
case "frozenby": case "frozenby":
cRollinfoVo.setFrozenby(queryList.getQueryValue().toString());
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
cRollinfoVo.setFrozenby(queryList.getQueryValue().toString());
break; break;
case "expireddate": 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; break;
case "manufacturedate": 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; break;
case "toexpiredays": case "toexpiredays":
cRollinfoVo.setToexpiredays(Integer.valueOf(queryList.getQueryValue().toString()));
if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) {
cRollinfoVo.setToexpiredays(Integer.valueOf(queryList.getQueryValue().toString()));
}
break; break;
} }
} }
@ -151,23 +194,23 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
@Override @Override
public void updateExpireddate(CRollinfoEntity cRollinfo) { public void updateExpireddate(CRollinfoEntity cRollinfo) {
lambdaUpdate().eq(CRollinfoEntity::getRollno,cRollinfo.getRollno())
lambdaUpdate().eq(CRollinfoEntity::getRollno, cRollinfo.getRollno())
.update(cRollinfo); .update(cRollinfo);
} }
@Override @Override
public CRollinfoEntity infoRollno(CRollinfoEntity rollno) { public CRollinfoEntity infoRollno(CRollinfoEntity rollno) {
return lambdaQuery() 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 @Override
@Transactional @Transactional
public void batchUpdateExpireddate(List<CRollinfoEntity> cRollinfoList) { public void batchUpdateExpireddate(List<CRollinfoEntity> cRollinfoList) {
cRollinfoList.forEach(rollInfo -> { 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();
}); });
} }
} }

1
src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java
View File

@ -73,6 +73,7 @@ public class SysFtpController extends AbstractController {
String newFileName = RandomUtil.getOrderNoByAtomic("file")+suffix; String newFileName = RandomUtil.getOrderNoByAtomic("file")+suffix;
File dir = multipartFileToFile(file,newFileName); File dir = multipartFileToFile(file,newFileName);
r = FTPUtils.uploadFtpFile(dir); r = FTPUtils.uploadFtpFile(dir);
dir.delete();
ossEntity.setUrl(r.get("url").toString()); ossEntity.setUrl(r.get("url").toString());
ossEntity.setCreatedBy(user.getUsername()); ossEntity.setCreatedBy(user.getUsername());
ossEntity.setFileName(fileName); ossEntity.setFileName(fileName);

2
src/main/java/com/gaotao/modules/pda/service/impl/ReceiptServiceImpl.java
View File

@ -92,7 +92,7 @@ public class ReceiptServiceImpl implements ReceiptService {
} }
//判断供应商是否一致 //判断供应商是否一致
String supplierId = session.getAttribute("supplierId").toString(); 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"); Map<String, String> rollNos = (Map<String, String>) session.getAttribute("rollNos");
//判断是否多次扫描 //判断是否多次扫描

Write Preview
Loading…
Cancel
Save