|
|
|
@ -1609,9 +1609,9 @@ public class SubController {
|
|
|
|
|
pmSubHisDO.setAttribute3(""); // 假设没有对应字段,设置为默认值
|
|
|
|
|
pmSubHisDO.setAttribute4(""); // 假设没有对应字段,设置为默认值
|
|
|
|
|
pmSubHisDO.setAttribute5(""); // 假设没有对应字段,设置为默认值
|
|
|
|
|
pmSubHisDO.setRollThk(maxRate.getVirtualSlab_Thk()); // 轧件厚
|
|
|
|
|
pmSubHisDO.setRollWid(BigDecimal.valueOf(maxRate.getVirtualSlab_Wid())); // 轧件宽
|
|
|
|
|
pmSubHisDO.setRollLen(BigDecimal.valueOf(maxRate.getVirtualSlab_Len())); // 轧件长
|
|
|
|
|
pmSubHisDO.setRollThk(maxRate.getCal_Thk()); // 轧件厚
|
|
|
|
|
pmSubHisDO.setRollWid(BigDecimal.valueOf(maxRate.getCal_Wid())); // 轧件宽
|
|
|
|
|
pmSubHisDO.setRollLen(BigDecimal.valueOf(maxRate.getCal_Len())); // 轧件长
|
|
|
|
|
pmSubHisDO.setHeadCut(BigDecimal.valueOf(maxRate.getHead_Len())); // 头部切舍量
|
|
|
|
|
pmSubHisDO.setTailCut(BigDecimal.valueOf(maxRate.getTail_Len())); // 尾部切舍量
|
|
|
|
|
pmSubHisDO.setWidCut(BigDecimal.valueOf(maxRate.getTrimming())); // 切边宽度,假设没有对应字段,设置为默认值
|
|
|
|
@ -1644,7 +1644,7 @@ public class SubController {
|
|
|
|
|
|
|
|
|
|
pmSubOrdDO.setPosX(BigDecimal.valueOf( intX.intValue())); // X坐标,假设默认为0
|
|
|
|
|
intX.addAndGet(gPreOrder.getLen()+5);//X坐标
|
|
|
|
|
pmSubOrdDO.setPosY(BigDecimal.valueOf(maxRate.getTrimming()+gPreOrder.getWid())); // Y坐标,假设默认为0
|
|
|
|
|
pmSubOrdDO.setPosY(BigDecimal.valueOf(maxRate.getTrimming()+gPreOrder.getWidthAddv())); // Y坐标,假设默认为0
|
|
|
|
|
|
|
|
|
|
pmSubOrdDO.setDelivyDate(new Date()); // 交货日期,假设默认为当前时间
|
|
|
|
|
pmSubOrdDO.setAxisOrd("0"); // 轴合同
|
|
|
|
@ -1669,11 +1669,7 @@ public class SubController {
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
// 批量插入数据
|
|
|
|
|
// if (!plistpmSubOrdDO.isEmpty()) {
|
|
|
|
|
// subService.batchInsertPmSubHisDO(plistpmSubHisDO);
|
|
|
|
|
// subService.batchInsert(plistpmSubOrdDO);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
plistpmSubHisDO.forEach(p->{
|
|
|
|
|
|
|
|
|
|
subService.InsertPmSubHisDO(p);
|
|
|
|
@ -1710,8 +1706,8 @@ public class SubController {
|
|
|
|
|
|
|
|
|
|
//组板板坯表
|
|
|
|
|
public void SetPmPdSlab(SlabInfoDO SInfo) {
|
|
|
|
|
for (int i = 0; i < gltGGrpCalRslt.size(); i++) {
|
|
|
|
|
GGrpCalRslt ggcr = gltGGrpCalRslt.get(i);
|
|
|
|
|
for (int i = 0; i < gltSelGGrpCalRslt.size(); i++) {
|
|
|
|
|
GGrpCalRslt ggcr = gltSelGGrpCalRslt.get(i);
|
|
|
|
|
PmPdSlabDO pmPdSlabDO = new PmPdSlabDO();
|
|
|
|
|
pmPdSlabDO.setPono(SInfo.getPono());
|
|
|
|
|
pmPdSlabDO.setSlabDivNo(BigDecimal.ZERO); //TODO 板坯分割号 未赋值 查询板坯号等于slab_no的组板板坯表的记录数+1
|
|
|
|
@ -1891,8 +1887,8 @@ public class SubController {
|
|
|
|
|
|
|
|
|
|
//大板粗切位置表
|
|
|
|
|
public void SetPmPdPlateCut() {
|
|
|
|
|
for (int i = 0; i < gltGGrpCalRslt.size(); i++) {
|
|
|
|
|
GGrpCalRslt ggcr = gltGGrpCalRslt.get(i);
|
|
|
|
|
for (int i = 0; i < gltSelGGrpCalRslt.size(); i++) {
|
|
|
|
|
GGrpCalRslt ggcr = gltSelGGrpCalRslt.get(i);
|
|
|
|
|
PmPdPlateCutDO pmPdPlateCutDO = new PmPdPlateCutDO();
|
|
|
|
|
pmPdPlateCutDO.setPdMatNo(ggcr.getVirtualSlabNo());
|
|
|
|
|
//TODO 粗切类型 粗切位置 位置序号 取值待定
|
|
|
|
@ -1910,8 +1906,8 @@ public class SubController {
|
|
|
|
|
|
|
|
|
|
//组合子板位置表
|
|
|
|
|
public void SetPmPdBlockPos() {
|
|
|
|
|
for (int i = 0; i < gltGGrpCalRslt.size(); i++) {
|
|
|
|
|
GGrpCalRslt ggcr = gltGGrpCalRslt.get(i);
|
|
|
|
|
for (int i = 0; i < gltSelGGrpCalRslt.size(); i++) {
|
|
|
|
|
GGrpCalRslt ggcr = gltSelGGrpCalRslt.get(i);
|
|
|
|
|
List<String> orderNoList = ggcr.getLtActInfoGPreOrder().stream()
|
|
|
|
|
.map(GPreOrder::getOrderNo).distinct().collect(Collectors.toList()); //合同号去重
|
|
|
|
|
for (int j = 0; j < orderNoList.size(); j++) {
|
|
|
|
@ -1938,8 +1934,8 @@ public class SubController {
|
|
|
|
|
|
|
|
|
|
//组板合同总量表
|
|
|
|
|
public void SetPmPdContSum() {
|
|
|
|
|
for (int i = 0; i < gltGGrpCalRslt.size(); i++) {
|
|
|
|
|
GGrpCalRslt ggcr = gltGGrpCalRslt.get(i);
|
|
|
|
|
for (int i = 0; i < gltSelGGrpCalRslt.size(); i++) {
|
|
|
|
|
GGrpCalRslt ggcr = gltSelGGrpCalRslt.get(i);
|
|
|
|
|
List<String> orderNoList = ggcr.getLtActInfoGPreOrder().stream()
|
|
|
|
|
.map(GPreOrder::getOrderNo).distinct().collect(Collectors.toList()); //合同号去重
|
|
|
|
|
for (int j = 0; j < orderNoList.size(); j++) {
|
|
|
|
@ -1979,8 +1975,8 @@ public class SubController {
|
|
|
|
|
|
|
|
|
|
//组板小板位置表
|
|
|
|
|
public void SetPmSmallPltPos() {
|
|
|
|
|
for (int i = 0; i < gltGGrpCalRslt.size(); i++) {
|
|
|
|
|
GGrpCalRslt ggcr = gltGGrpCalRslt.get(i);
|
|
|
|
|
for (int i = 0; i < gltSelGGrpCalRslt.size(); i++) {
|
|
|
|
|
GGrpCalRslt ggcr = gltSelGGrpCalRslt.get(i);
|
|
|
|
|
for (int j = 0; j < ggcr.getLtActInfoGPreOrder().size(); j++) {
|
|
|
|
|
GPreOrder gpo = ggcr.getLtActInfoGPreOrder().get(j);
|
|
|
|
|
PmSmallPltPosDO pmSmallPltPosDO = new PmSmallPltPosDO();
|
|
|
|
@ -2027,8 +2023,8 @@ public class SubController {
|
|
|
|
|
pmCmdSlabDO.setSlabNo(pmPdSlabDO.getSlabNo());
|
|
|
|
|
pmCmdSlabDO.setVirtualSlabNo(pmPdSlabDO.getVirtualSlabNo());
|
|
|
|
|
pmCmdSlabDO.setPdStatusHp("18");
|
|
|
|
|
pmCmdSlabDO.setShortSlabNumInLong(gltGGrpCalRslt.size());
|
|
|
|
|
pmCmdSlabDO.setBigPlateNum(gltGGrpCalRslt.size());
|
|
|
|
|
pmCmdSlabDO.setShortSlabNumInLong(gltSelGGrpCalRslt.size());
|
|
|
|
|
pmCmdSlabDO.setBigPlateNum(gltSelGGrpCalRslt.size());
|
|
|
|
|
pmCmdSlabDO.setSlabDivNo(pmPdSlabDO.getSlabDivNo().intValue());
|
|
|
|
|
pmCmdSlabDO.setOrderNumInPlate(pmPdSlabDO.getOrderNumInPlate().intValue());
|
|
|
|
|
pmCmdSlabDO.setOrderRemainDiv(pmPdSlabDO.getOrderRemainDiv());
|
|
|
|
|