yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
bawei 2 years ago
parent 495d0dc5b6 de7822f5f5
commit b6aa4ef4db
2 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File

13
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
Unescape View File

@ -69,10 +69,7 @@ import java.io.InputStream;
import java.math.BigDecimal;
import java.nio.charset.Charset;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -331,8 +328,10 @@ public class PurchaseorderController {
MultipartFile file = list.get(0);
if (file.getOriginalFilename().endsWith(".zip")) {
cn.hutool.core.io.FileUtil.del(new File(configValueUtil.getTemporaryFilePath() +"unzip\\"));
String filePath = configValueUtil.getTemporaryFilePath() + "unzip\\";
String s = UUID.randomUUID().toString();
cn.hutool.core.io.FileUtil.del(new File(configValueUtil.getTemporaryFilePath() +"unzip\\"+s+"\\"));
String filePath = configValueUtil.getTemporaryFilePath() + "unzip\\"+s+"\\";
// String fileName = RandomUtil.uuId() + "." + UpUtil.getFileType(file);
// fileName = XSSEscape.escape(fileName);
@ -346,7 +345,7 @@ public class PurchaseorderController {
File gbk = ZipUtil.unzip(inputStream, temporaryFile, Charset.forName("GBK"));
List<Object> resultList= FileCopy.getInfoAndUpFile(gbk.listFiles());
inputStream.close();
cn.hutool.core.io.FileUtil.del(temporaryFile);
// cn.hutool.core.io.FileUtil.del(temporaryFile);
// FileUtil.upFile(file, filePath, fileName);
DownloadVO vo = DownloadVO.builder().build();
vo.setName(String.valueOf(resultList.get(0)));

68
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
Unescape View File

@ -1572,49 +1572,53 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
}
// 送货车号
if (model.getVehicleId() != null) {
LambdaQueryWrapper<VehicleEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(VehicleEntity::getTicketno, model.getVehicleId());
if (!String.valueOf(model.getDriverName()).equals("null")){
wrapper.eq(VehicleEntity::getDrivername,model.getDriverName());
}
if (model.getDriverVehicleId()==null||model.getVehicleId().equals(model.getDriverVehicleId())){
LambdaQueryWrapper<VehicleEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(VehicleEntity::getTicketno, model.getVehicleId());
if (!String.valueOf(model.getDriverName()).equals("null")){
wrapper.eq(VehicleEntity::getDrivername,model.getDriverName());
}
List<VehicleEntity> vehicleEntityList = vehicleMapper.selectList(wrapper);
if (vehicleEntityList != null && vehicleEntityList.size() > 0) {
model.setVehicleId(vehicleEntityList.get(0).getId());
VehicleEntity vehicleEntity = vehicleEntityList.get(0);
List<VehicleEntity> vehicleEntityList = vehicleMapper.selectList(wrapper);
if (vehicleEntityList != null && vehicleEntityList.size() > 0) {
model.setVehicleId(vehicleEntityList.get(0).getId());
VehicleEntity vehicleEntity = vehicleEntityList.get(0);
// 车辆照片
vehicleEntity.setVehiclephotos(model.getCarPictures());
vehicleEntity.setVehiclephotos(model.getCarPictures());
// 联系信息
if (!String.valueOf(model.getContact()).equals("null")&&!model.getContact().isEmpty()) {
vehicleEntity.setContact(model.getContact());
}
vehicleMapper.updateById(vehicleEntity);
} else {
if (!String.valueOf(model.getContact()).equals("null")&&!model.getContact().isEmpty()) {
vehicleEntity.setContact(model.getContact());
}
vehicleMapper.updateById(vehicleEntity);
} else {
// 添加车牌号
// id
Long aLong = new DefaultIdentifierGenerator().nextId(VehicleEntity.class);
VehicleEntity vehicleEntity = new VehicleEntity();
vehicleEntity.setId(aLong.toString());
Long aLong = new DefaultIdentifierGenerator().nextId(VehicleEntity.class);
VehicleEntity vehicleEntity = new VehicleEntity();
vehicleEntity.setId(aLong.toString());
// 车辆照片
vehicleEntity.setVehiclephotos(model.getCarPictures());
vehicleEntity.setVehiclephotos(model.getCarPictures());
// 车牌号
vehicleEntity.setTicketno(model.getVehicleId());
vehicleEntity.setTicketno(model.getVehicleId());
// 联系方式
if (!String.valueOf(model.getContact()).equals("null")&&!model.getContact().isEmpty()){
vehicleEntity.setContact(model.getContact());
}
if (!String.valueOf(model.getContact()).equals("null")&&!model.getContact().isEmpty()){
vehicleEntity.setContact(model.getContact());
}
// 司机名称
if (!String.valueOf(model.getDriverName()).equals("null")&&!model.getDriverName().isEmpty()){
if (!String.valueOf(model.getDriverName()).equals("null")&&!model.getDriverName().isEmpty()){
vehicleEntity.setDrivername(model.getDriverName());
}
vehicleMapper.insert(vehicleEntity);
model.setVehicleId(aLong.toString());
// model.setCauseError("车牌号不存在！请添加车辆信息在尝试添加！");
// errList.add(model);
// ints.add(i);
// continue;
vehicleEntity.setDrivername(model.getDriverName());
}
vehicleMapper.insert(vehicleEntity);
model.setVehicleId(aLong.toString());
}
}else {
model.setCauseError("目录名称的车牌号对应不上表格中的，请检查！excel中的车牌号为："+model.getVehicleId()+",目录中车牌号为："+model.getDriverVehicleId());
errList.add(model);
ints.add(i);
continue;
}
}else{
if (model.getDriverVehicleId()!=null){
model.setVehicleId(model.getDriverVehicleId());

Write Preview
Loading…
Cancel
Save