jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

问题清单修复

Browse Source
tags/yfai-mes-ext-v1.0
jun 10 months ago
parent 79c62b3d63
commit 1de19ae114
7 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartShippingGroupService.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.ext.mes.api.base;
import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
import io.swagger.annotations.ApiOperation;
/**
* @Description:
@ -9,5 +10,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
*/
public interface IMesPartShippingGroupService extends IBaseMesService<MesPartShippingGroup> {
@ApiOperation(value = "查询发运组数据")
MesPartShippingGroup getMesPartShippingGroup(String organizeCode,String shippingGroupCode);
}

4
modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesJisShipping.groovy
Unescape Escape View File

@ -42,12 +42,12 @@ class MesToPiscesMesJisShipping {
//数据汇总
String key = String.valueOf(rowMap.get("HANDLE_FID")) + String.valueOf("part_no")
if (destData.containsKey(key)) {
destData.get(key).put(key, MathOperation.add(Double.valueOf(destData.get(key).get("qty") + ""), Double.valueOf(rowMap.get("qty") + "")))
destData.get(key).put("quantity_per_car", MathOperation.add(Double.valueOf(destData.get(key).get("quantity_per_car") + ""), Double.valueOf(rowMap.get("quantity_per_car") + "")))
} else {
destData.put(key, rowMap)
}
}
return destData;
return new ArrayList<>(destData.values());
}
private MesShippingOrderManagement getMesShipping(String organizeCode, String shippingCode, Map<String, MesShippingOrderManagement> mesPartShippingGroupMap) {

7
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupService.java
Unescape Escape View File

@ -88,4 +88,11 @@ public class MesPartShippingGroupService extends BaseMesService<MesPartShippingG
}
}
}
@Override
public MesPartShippingGroup getMesPartShippingGroup(String organizeCode, String shippingGroupCode) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(shippingGroupCode, "shippingGroupCode", packBean);
return baseRDao.getByProperty(packBean);
}
}

7
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService;
import cn.estsh.i3plus.ext.mes.api.base.IMesPartSapService;
import cn.estsh.i3plus.ext.mes.api.base.IMesPartShippingGroupService;
import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@ -61,6 +62,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
@Autowired
private IMesPartSapService partService;
@Autowired
private IMesPartShippingGroupService mesPartShippingGroupService;
protected void setPackQueryBean(MesShippingOrderManagement bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getShippingCode(), "shippingCode", packBean);
@ -292,6 +295,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
Map<String, List<MesShippingOrderManagementDetail>> detailMap = detailDeleteList.stream().collect(Collectors.groupingBy(k -> k.getPartNo()));
List<MesJisShipping> jisShippingList = new ArrayList<>();
MesPartShippingGroup mesPartShippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(bean.getOrganizeCode(), originBean.getShippingGroupCode());
detailMap.forEach((k, v) -> {
MesPartSap part = partService.getMesPartSapByPartNo(v.get(0).getPartNo(), bean.getOrganizeCode());
@ -304,7 +308,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
jisShipping.setShippingTime(TimeTool.getNowTime(true));
jisShipping.setDock(originBean.getSendDockCode());
jisShipping.setErpWarerhouse(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE"));
jisShipping.setErpWarehous(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS"));
jisShipping.setErpWarehous(mesPartShippingGroup == null || StringUtils.isEmpty(mesPartShippingGroup.getSrcWarerhouse()) ? configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS") : mesPartShippingGroup.getSrcWarerhouse());
jisShipping.setCusDock(originBean.getCustDockCode());
jisShipping.setCustOrderNo(v.get(0).getCustOrderNo());
jisShipping.setSerialNumber(v.get(0).getBarcode());
@ -317,6 +321,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
}
jisShipping.setOffTime(TimeTool.getNowTime(true));
jisShipping.setFid(UUID.randomUUID().toString());
jisShipping.setSystemSyncStatus(CommonEnumUtil.FALSE);
ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName());
jisShippingList.add(jisShipping);
});

32
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/file/MesModuleExcelServiceImpl.java
Unescape Escape View File

@ -1,11 +1,10 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.file;
import cn.estsh.i3plus.ext.mes.api.base.file.IMesFileService;
import cn.estsh.i3plus.ext.mes.api.base.file.IMesModuleExcelService;
import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesModuleExcelDao;
import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService;
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
import cn.estsh.i3plus.ext.mes.apiservice.utils.HuaWeiOBSUtil;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.ext.mes.pojo.sqlpack.MesExtHqlPack;
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@ -18,14 +17,13 @@ import cn.estsh.i3plus.pojo.mes.bean.MesFile;
import cn.estsh.i3plus.pojo.mes.bean.MesModuleExcel;
import cn.estsh.i3plus.pojo.mes.model.MesModuleExcelModel;
import cn.estsh.i3plus.pojo.mes.repository.MesFileRepository;
import com.obs.services.model.PutObjectResult;
import cn.estsh.i3plus.pojo.platform.bean.SysFile;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
/**
@ -45,6 +43,9 @@ public class MesModuleExcelServiceImpl extends BaseMesService<MesModuleExcel> im
@Autowired
private MesFileRepository mesFileRDao;
@Autowired
private IMesFileService mesFileService;
@Override
public ListPager<MesModuleExcelModel> queryModuleExcelByPager(MesModuleExcel mesModuleExcel, Pager pager) {
pager = PagerHelper.getPager(pager, mesModuleExcelDao.queryModuleExcelCount(mesModuleExcel));
@ -93,21 +94,20 @@ public class MesModuleExcelServiceImpl extends BaseMesService<MesModuleExcel> im
}
private MesFile getMesFile(MultipartFile file, MesModuleExcel mesModuleExcel) {
String fileName = file.getOriginalFilename();
PutObjectResult putObjectResult = null;
try {
putObjectResult = HuaWeiOBSUtil.putObjectByMultipartFile(MesCommonConstant.OBS_BUCKET_NAME, fileName, file);
} catch (IOException e) {
MesException.throwMesBusiException("文件上传失败");
SysFile sysFile = mesFileService.uploadFile(file);
if (sysFile.getFileTypeId() == null) {
MesException.throwMesBusiException("未在字典中定义该文件类型，无法上传成功，请先添加file_type字典");
}
MesFile mesFile = new MesFile();
mesFile.setOrganizeCode(mesModuleExcel.getOrganizeCode());
mesFile.setFileName(fileName);
mesFile.setFileUrl(putObjectResult.getObjectUrl());
mesFile.setFileSize(String.valueOf(file.getSize()));
mesFile.setGroupName(putObjectResult.getBucketName());
mesFile.setFileType(fileName != null && fileName.contains(".") ? fileName.substring(fileName.indexOf(".") + 1) : "");
mesFile.setFileOriginName(fileName);
mesFile.setFileName(sysFile.getDfsFileName());
mesFile.setFileUrl(sysFile.getFilePath());
mesFile.setFileSize(String.valueOf(sysFile.getFileSize()));
mesFile.setFileType(String.valueOf(sysFile.getFileTypeName()));
mesFile.setFileOriginName(sysFile.getFileOriginalName());
mesFile.setGroupName(sysFile.getDfsGroupName());
mesFile.setSyncTag(0);
ConvertBean.serviceModelInitialize(mesFile, mesModuleExcel.getCreateUser());
return mesFile;
}

6
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesYfReportServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report;
import cn.estsh.i3plus.ext.mes.api.base.IMesProduceSnService;
import cn.estsh.i3plus.ext.mes.api.base.IMesProductionRecordService;
import cn.estsh.i3plus.ext.mes.api.base.file.IMesFileService;
import cn.estsh.i3plus.ext.mes.api.busi.report.IMesYfReportService;
import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IMesYfReportDao;
import cn.estsh.i3plus.ext.mes.apiservice.utils.BeanMapUtilsExt;
@ -83,6 +84,9 @@ public class MesYfReportServiceImpl implements IMesYfReportService {
@Autowired
private MesWorkCenterRepository workCenterRepository;
@Autowired
private IMesFileService mesFileService;
@Override
public ListPager<MesDeviceDataQueryReportResultModel> queryMesDeviceDataByPager(MesDeviceDataQueryReportConditionModel queryReportModel, Pager pager) {
ListPager<MesDeviceDataQueryReportResultModel> mesDeviceDataQueryReportResultModelListPager =
@ -203,7 +207,7 @@ public class MesYfReportServiceImpl implements IMesYfReportService {
//生成PDF文件并上传
try {
mesTraceabilityReportModel.setUrl(MesTraceabilityTemp.getMesTraceabilityTemp(mesTraceabilityReportModel));
mesTraceabilityReportModel.setUrl(MesTraceabilityTemp.getMesTraceabilityTemp(mesFileService,mesTraceabilityReportModel));
} catch (IOException e) {
MesException.throwMesBusiException("删除文件：生成PDF文件失败");
}

5
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/utils/MesTraceabilityTemp.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.ext.mes.apiservice.utils;
import cn.estsh.i3plus.ext.mes.api.base.file.IMesFileService;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellScanMonitorLog;
@ -26,7 +27,7 @@ import static cn.estsh.i3plus.ext.mes.apiservice.dbinterface.WmsSAPDbQuery.lz;
public class MesTraceabilityTemp {
public static String getMesTraceabilityTemp(MesTraceabilityReportModel mesTraceabilityReportModel) throws IOException {
public static String getMesTraceabilityTemp(IMesFileService mesFileService,MesTraceabilityReportModel mesTraceabilityReportModel) throws IOException {
String url = "";
File file = new File(System.getProperty("java.io.tmpdir") + File.separator + "追溯报表orgPdf" + mesTraceabilityReportModel.getProductSn() + "-" + mesTraceabilityReportModel.getPartNo() + ".PDF");
File destFile = null;
@ -624,7 +625,7 @@ public class MesTraceabilityTemp {
//添加分页
destFile = new File(PageNumPdfPageEvent.addPageNum(file.getPath(), file.getPath().replace("追溯报表orgPdf", "追溯报表")));
//文件上传
url = HuaWeiOBSUtil.putObjectByMultipartFile(MesCommonConstant.OBS_BUCKET_NAME, destFile.getName(), convert(destFile)).getObjectUrl();
url = mesFileService.uploadFile(convert(destFile)).getFilePath();
} catch (DocumentException | IOException e) {
MesException.throwMesBusiException("生成PDF文件失败");
} finally {

Write Preview
Loading…
Cancel
Save