sunhao
/
XG_Project_HD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
sunhao 1 month ago
parent 797640322d
commit ae1839caf3
4 changed files with 278 additions and 164 deletions
Show Stats Download Patch File Download Diff File

126
XG_Project1/src/main/java/com/xisc/pm/api/controller/v1/SubController.java
Unescape Escape View File

@ -343,15 +343,15 @@ public class SubController {
//数据整理
SetSaveDate(p,organizationId);
//开启事务
// TransactionStatus transactionStatus = transactionService.begin();
//TransactionStatus transactionStatus = transactionService.begin();
try {
//保存数据
SaveData(p);
// transactionService.commit(transactionStatus);
//transactionService.commit(transactionStatus);
} catch (Exception e) {
logger.error("保存事务回滚：" + p.getSlabNo(), e);
//回滚事务
// transactionService.rollback(transactionStatus);
//transactionService.rollback(transactionStatus);
}
}
@ -816,6 +816,7 @@ public class SubController {
GCG.getLtInfoGPreOrder().add(f);//添加订单信息
});
try {
//存在订单，添加可计算分组
if (GCG.getLtInfoGPreOrder().size() > 0) {
@ -853,7 +854,23 @@ public class SubController {
&& p.getCombinePlateWidthFrom().compareTo(BigDecimal.valueOf(maxWidth.orElse(0) + maxAddWidth.orElse(0))) <= 0
&& p.getCombinePlateWidthTo().compareTo(BigDecimal.valueOf(maxWidth.orElse(0) + maxAddWidth.orElse(0))) >= 0
)) {
if (GCG.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType().contains("Q")) {
if (GCG.getLtInfoGPreOrder().get(0)==null)
{
}
if (GCG.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO()==null)
{
}
if (GCG.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType()==null)
{
}
if (GCG.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType() != null
&& GCG.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType().contains("Q")) {
decThkAdd = plistPmThickAddvBtDO.stream().filter(p -> p.getMscLineNo().equals(SInfo.getMscLineNo())
&& p.getTolTypeCode().equals(strThkTolType)
&& p.getWholeHeatTreatmentType().equals("Q")
@ -934,6 +951,9 @@ public class SubController {
gltGCalGrp.add(GCG);
}
} catch (Exception ex) {
logger.error("SetGrpConBinDataBySlab", ex);
}
});
@ -1101,7 +1121,24 @@ public class SubController {
&& p.getCombinePlateWidthFrom().compareTo(BigDecimal.valueOf(maxWidth + maxAddWidth.orElse(0))) <= 0
&& p.getCombinePlateWidthTo().compareTo(BigDecimal.valueOf(maxWidth + maxAddWidth.orElse(0))) >= 0
)) {
if (GCG.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType().contains("Q")) {
if (GCG.getLtInfoGPreOrder().get(0)==null)
{
}
if (GCG.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO()==null)
{
}
if (GCG.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType()==null)
{
}
if (GCG.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType()!=null &&
GCG.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType().contains("Q")) {
decThkAdd = plistPmThickAddvBtDO.stream().filter(p -> p.getMscLineNo().equals(SInfo.getMscLineNo())
&& p.getTolTypeCode().equals(strThkTolType)
&& p.getWholeHeatTreatmentType().equals("Q")
@ -2453,8 +2490,76 @@ public class SubController {
// 使用 AtomicInteger 获取索引
AtomicInteger index = new AtomicInteger(0);
AtomicInteger intX = new AtomicInteger(maxRate.getHead_Len());
maxRate.getLtActInfoGPreOrder().forEach(
gPreOrder -> {
boolean Firstflag = true;
for(int m = 0; m < maxRate.getLtActInfoGPreOrder().size(); m++)
{
GPreOrder gPreOrder=maxRate.getLtActInfoGPreOrder().get(m);
if (gPreOrder.getCombinationFlag()==1)
{
BigDecimal intY = BigDecimal.valueOf(0);
for (int i = 0; i < gPreOrder.getLtInfoCombGPreOrder().size(); i++) {
int currentIndex = index.getAndIncrement();
// 实例化 PmSubOrdDO 对象
PmSubOrd pmSubOrdDO = new PmSubOrd();
// 生成虚拟板坯号
pmSubOrdDO.setVirtualSlabNo(virtualSlabNo); // 虚拟板坯号
pmSubOrdDO.setRelKey(virtualSlabNo); // 关系号
pmSubOrdDO.setSlabNo(SInfo.getSlabNo()); // 板坯号
// 手动为每个字段赋值
pmSubOrdDO.setOrderNo(gPreOrder.getLtInfoCombGPreOrder().get(i).getInfoGPreOrder().getOrderNo()); // 合同号
pmSubOrdDO.setSgSign(gPreOrder.getLtInfoCombGPreOrder().get(i).getInfoGPreOrder().getInfoPmProContProdAttrDO().getSgSign()); // 牌号
pmSubOrdDO.setStNo(SInfo.getStNo()); // 内部钢种
pmSubOrdDO.setOrderThick(gPreOrder.getLtInfoCombGPreOrder().get(i).getInfoGPreOrder().getThk()); // 订货厚度
pmSubOrdDO.setOrderWidth(BigDecimal.valueOf(gPreOrder.getLtInfoCombGPreOrder().get(i).getInfoGPreOrder().getWid())); // 订货宽度
pmSubOrdDO.setLenAim(BigDecimal.valueOf(gPreOrder.getLtInfoCombGPreOrder().get(i).getInfoGPreOrder().getLen())); // 订货长度
pmSubOrdDO.setPosX(BigDecimal.valueOf(intX.intValue())); // X坐标，假设默认为0
//第一块
if (i == 0) {
intY = BigDecimal.valueOf(maxRate.getTrimming() + gPreOrder.getLtInfoCombGPreOrder().get(i).getInfoGPreOrder().getWidthAddv());
pmSubOrdDO.setPosY(intY); // Y坐标，假设默认为0
intY = intY.add(BigDecimal.valueOf(gPreOrder.getLtInfoCombGPreOrder().get(i).getInfoGPreOrder().getWid()));
} else {
pmSubOrdDO.setPosY(intY); // Y坐标，假设默认为0
}
pmSubOrdDO.setDelivyDate(new Date()); // 交货日期，假设默认为当前时间
if (Firstflag) {
pmSubOrdDO.setAxisOrd("1"); // 轴合同
Firstflag = false;
} else {
pmSubOrdDO.setAxisOrd("0"); // 轴合同
}
pmSubOrdDO.setAxisOrd("0"); // 轴合同
pmSubOrdDO.setLackNum(BigDecimal.ZERO); // 欠量，假设默认为0
pmSubOrdDO.setOverNum(BigDecimal.ZERO); // 超投，假设默认为0
pmSubOrdDO.setCreationDate(new Date()); // 创建时间
pmSubOrdDO.setCreatedBy(781L); // 创建人ID，假设默认为781
pmSubOrdDO.setLastUpdatedBy(781L); // 最近更新人ID，假设默认为781
pmSubOrdDO.setLastUpdateDate(new Date()); // 最近更新时间
pmSubOrdDO.setTenantId(1L); // 租户ID，假设默认为0
pmSubOrdDO.setObjectVersionNumber(1L); // 行版本号，假设默认为0
pmSubOrdDO.setAttribute1(""); // 假设没有对应字段，设置为默认值
pmSubOrdDO.setAttribute2(""); // 假设没有对应字段，设置为默认值
pmSubOrdDO.setAttribute3(""); // 假设没有对应字段，设置为默认值
pmSubOrdDO.setAttribute4(""); // 假设没有对应字段，设置为默认值
pmSubOrdDO.setAttribute5(""); // 假设没有对应字段，设置为默认值
pmSubOrdDO.setOrderSeqNo(Long.valueOf(currentIndex)); // 合同顺序号，假设使用合同号作为顺序号
// 将 PmSubOrdDO 对象添加到列表中
plistpmSubOrdDO.add(pmSubOrdDO);
//记录被使用的订单数据
plistOrdHis.add(gPreOrder.getLtInfoCombGPreOrder().get(i).getInfoGPreOrder());
}
intX.addAndGet(gPreOrder.getLen() + 5);//X坐标
} else {
int currentIndex = index.getAndIncrement();
// 实例化 PmSubOrdDO 对象
@ -2499,9 +2604,8 @@ public class SubController {
//记录被使用的订单数据
plistOrdHis.add(gPreOrder);
}
);
}
//判断长宽大小
BigDecimal decLen = BigDecimal.valueOf(SInfo.getRemLen().intValue() - maxRate.getVirtualSlab_Len());
@ -2581,10 +2685,12 @@ public class SubController {
pmPdSlabDO.setAutoManualFlag("M");
pmPdSlabDO.setOrderRemainDiv("1");
pmPdSlabDO.setCanDelFlag("1");
//TODO：合同个数，取所有合同的数量
List<String> orderNoList = ggcr.getLtActInfoGPreOrder().stream().map(GPreOrder::getOrderNo).distinct().collect(Collectors.toList());//根据实际合同信息 的合同号去重 取出板内合同个数
pmPdSlabDO.setOrderNumInPlate(BigDecimal.valueOf(orderNoList.size()));
//TODO:合同数量，取所有小板的数据量
pmPdSlabDO.setTotSmallPlateNum(BigDecimal.valueOf(ggcr.getLtActInfoGPreOrder().size()));
//TODO：轴合同获取
Optional<PmContMscTech> resultPmContMscTechDO = plistPmContMscTechDO.stream()
.filter(item -> ggcr.getLtActInfoGPreOrder().get(0).getOrderNo().equals(item.getOrderNo())) //TODO 根据轴合同号查询合同工艺表 暂时取第一条合同
.findFirst();

8
XG_Project1/src/main/java/com/xisc/pm/api/dto/model/GCalGrp.java
Unescape Escape View File

@ -24,6 +24,14 @@ public class GCalGrp {
private BigDecimal Thk;
//长度
private int Len;
//厚度
private BigDecimal Order_Thk;
// 厚度公差上限
private BigDecimal thickTolMax;
//厚度公差下限
private BigDecimal thickTolMin;
//标准
private String SG_STD;
//宽度余量

2
XG_Project1/src/main/java/com/xisc/pm/api/dto/model/GPreOrder.java
Unescape Escape View File

@ -59,7 +59,7 @@ public class GPreOrder {
private QdToPoOrder infoQdToPoOrderDO;
//组合标识
private int CombinationFlag;
private int CombinationFlag = 0;
//组合信息
private List<GComBOrder> LtInfoCombGPreOrder;
}

104
XG_Project1/src/main/java/com/xisc/pm/app/service/impl/SubServiceImpl.java
Unescape Escape View File

@ -416,21 +416,21 @@ public class SubServiceImpl implements SubService {
@Transactional(rollbackFor = Exception.class)
public void SaveData(SlabInfoDO p,List<PmPdSlab> pmPdSlabDOList, List<PmPdPlateCut> pmPdPlateCutDOList, List<PmPdBlockPos> pmPdBlockPosDOList, List<PmPdContSum> pmPdContSumDOList, List<PmSmallPltPos> pmSmallPltPosDOList, List<PmCmdSlab> pmCmdSlabDOList, List<PmCmdLargePlt> pmCmdLargePltDOList, List<PmCmdCont> pmCmdContDOList, List<PmCmdSmallPlt> pmCmdSmallPltDOList, List<PmSubHis> plistpmSubHisDO, List<PmSubOrd> plistpmSubOrdDO) {
// 调用mm接口
// 查询MM_SLAB 信息获取板坯信息
PmPdSlabSplitDTO pmPdSlabSplitDTO = pmPdSlabRepository.selectMmSlabBySlabId(p.getSlabId(),p.getTenantId());
// 查询板坯信息表。第一次查询可能无值
PmPdSlabInfo pmPdSlabInfo = pmPdSlabInfoRepository.selectBySlabNo(p.getSlabNo(), p.getTenantId());
if (pmPdSlabInfo == null) {
pmPdSlabInfo = buildPmPdSlabInfo(pmPdSlabSplitDTO , p.getSlabNo() , p.getMscLineNo() , p.getTenantId());
pmPdSlabInfoRepository.insertSelective(pmPdSlabInfo);
System.out.println("pmPdSlabInfo表 保存成功");
// 轧钢模块“在制品材料管理封锁事件接口"
callMatStatusModify(pmPdSlabInfo);
System.out.println("mm模块接口 调用成功");
}
// // 调用mm接口
// // 查询MM_SLAB 信息获取板坯信息
// PmPdSlabSplitDTO pmPdSlabSplitDTO = pmPdSlabRepository.selectMmSlabBySlabId(p.getSlabId(),p.getTenantId());
//
// // 查询板坯信息表。第一次查询可能无值
// PmPdSlabInfo pmPdSlabInfo = pmPdSlabInfoRepository.selectBySlabNo(p.getSlabNo(), p.getTenantId());
//
// if (pmPdSlabInfo == null) {
// pmPdSlabInfo = buildPmPdSlabInfo(pmPdSlabSplitDTO , p.getSlabNo() , p.getMscLineNo() , p.getTenantId());
// pmPdSlabInfoRepository.insertSelective(pmPdSlabInfo);
// System.out.println("pmPdSlabInfo表 保存成功");
// // 轧钢模块“在制品材料管理封锁事件接口"
// callMatStatusModify(pmPdSlabInfo);
// System.out.println("mm模块接口 调用成功");
// }
@ -442,43 +442,43 @@ public class SubServiceImpl implements SubService {
pmSubOrdRepository.batchInsertSelective(plistpmSubOrdDO);
System.out.println("pmSubOrd表 保存成功");
}
if(pmPdSlabDOList.size()>0){
pmPdSlabRepository.batchInsertSelective(pmPdSlabDOList);
System.out.println("PmPdSlab表 保存成功");
}
if(pmPdPlateCutDOList.size()>0){
pmPdPlateCutRepository.batchInsertSelective(pmPdPlateCutDOList);
System.out.println("PmPdPlateCut 大板粗切位置 保存成功");
}
if(pmPdBlockPosDOList.size()>0){
pmPdBlockPosRepository.batchInsertSelective(pmPdBlockPosDOList);
System.out.println("PmPdBlockPos 组合子板位置表 保存成功");
}
if(pmPdContSumDOList.size()>0){
pmPdContSumRepository.batchInsertSelective(pmPdContSumDOList);
System.out.println("PmPdContSum 合同总量表 保存成功");
}
if(pmSmallPltPosDOList.size()>0){
pmSmallPltPosRepository.batchInsertSelective(pmSmallPltPosDOList);
System.out.println("PmSmallPltPos 命令小板位置表 保存成功");
}
if(pmCmdSlabDOList.size()>0){
pmCmdSlabRepository.batchInsertSelective(pmCmdSlabDOList);
System.out.println("PmCmdSlab 保存成功");
}
if(pmCmdLargePltDOList.size()>0){
pmCmdLargePltRepository.batchInsertSelective(pmCmdLargePltDOList);
System.out.println("pmCmdLargePltDO 命令大板 保存成功");
}
if(pmCmdContDOList.size()>0){
pmCmdContRepository.batchInsertSelective(pmCmdContDOList);
System.out.println("PmCmdCont 命令参数 保存成功");
}
if(pmCmdSmallPltDOList.size()>0){
pmCmdSmallPltRepository.batchInsertSelective(pmCmdSmallPltDOList);
System.out.println("PmCmdSmallPlt 命令小板表 保存成功");
}
//
// if(pmPdSlabDOList.size()>0){
// pmPdSlabRepository.batchInsertSelective(pmPdSlabDOList);
// System.out.println("PmPdSlab表 保存成功");
// }
// if(pmPdPlateCutDOList.size()>0){
// pmPdPlateCutRepository.batchInsertSelective(pmPdPlateCutDOList);
// System.out.println("PmPdPlateCut 大板粗切位置 保存成功");
// }
// if(pmPdBlockPosDOList.size()>0){
// pmPdBlockPosRepository.batchInsertSelective(pmPdBlockPosDOList);
// System.out.println("PmPdBlockPos 组合子板位置表 保存成功");
// }
// if(pmPdContSumDOList.size()>0){
// pmPdContSumRepository.batchInsertSelective(pmPdContSumDOList);
// System.out.println("PmPdContSum 合同总量表 保存成功");
// }
// if(pmSmallPltPosDOList.size()>0){
// pmSmallPltPosRepository.batchInsertSelective(pmSmallPltPosDOList);
// System.out.println("PmSmallPltPos 命令小板位置表 保存成功");
// }
// if(pmCmdSlabDOList.size()>0){
// pmCmdSlabRepository.batchInsertSelective(pmCmdSlabDOList);
// System.out.println("PmCmdSlab 保存成功");
// }
// if(pmCmdLargePltDOList.size()>0){
// pmCmdLargePltRepository.batchInsertSelective(pmCmdLargePltDOList);
// System.out.println("pmCmdLargePltDO 命令大板 保存成功");
// }
// if(pmCmdContDOList.size()>0){
// pmCmdContRepository.batchInsertSelective(pmCmdContDOList);
// System.out.println("PmCmdCont 命令参数 保存成功");
// }
// if(pmCmdSmallPltDOList.size()>0){
// pmCmdSmallPltRepository.batchInsertSelective(pmCmdSmallPltDOList);
// System.out.println("PmCmdSmallPlt 命令小板表 保存成功");
// }
}
/**

Write Preview
Loading…
Cancel
Save