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

2025-02-19

Browse Source
main
sunhao 4 days ago
parent e439d9fdcd
commit 9dc3b71872
1 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File

61
1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
Unescape Escape View File

@ -329,25 +329,26 @@ public class SubController {
public void SaveHisData(SlabInfoDO SInfo) {
//存储数据，组板结果
plistpmSubHisDO.forEach(e -> {
String strMaxSeq = subService.GetMaxSeq(SInfo.getPono());
int intSeq = 0;
String strMaxSeq = subService.GetMaxSeq(SInfo.getPono());
if (strMaxSeq.length() >= 4 && strMaxSeq.charAt(strMaxSeq.length() - 4) == '9') {
intSeq = Integer.parseInt(strMaxSeq.substring(strMaxSeq.length() - 3));
}
int intSeq = 0;
for (int i = 0; i < plistpmSubHisDO.size(); i++) {
if (strMaxSeq.length() >= 4 && strMaxSeq.charAt(strMaxSeq.length() - 4) == '9') {
intSeq = Integer.parseInt(strMaxSeq.substring(strMaxSeq.length() - 3));
}
intSeq+=1;
String virtualSlabNo = generateVirtualSlabNoSave(SInfo.getPono(), intSeq);
String strGuid = e.getRelKey();
String strGuid = plistpmSubHisDO.get(i).getRelKey();
//获取虚拟板坯号
e.setVirtualSlabNo(virtualSlabNo);
plistpmSubHisDO.get(i).setVirtualSlabNo(virtualSlabNo);
subService.InsertPmSubHisDO(e);
subService.InsertPmSubHisDO(plistpmSubHisDO.get(i));
//删选plistpmSubOrdDO中虚拟板坯号等于strGuid的信息
plistpmSubOrdDO.stream()
.filter(f -> !f.getRelKey().equals(strGuid))
@ -362,7 +363,35 @@ public class SubController {
});
});
}
//
// //存储数据，组板结果
// plistpmSubHisDO.forEach(e -> {
//
// String virtualSlabNo = generateVirtualSlabNoSave(SInfo.getPono(), intSeq);
//
// String strGuid = e.getRelKey();
//
// //获取虚拟板坯号
// e.setVirtualSlabNo(virtualSlabNo);
//
// subService.InsertPmSubHisDO(e);
// //删选plistpmSubOrdDO中虚拟板坯号等于strGuid的信息
// plistpmSubOrdDO.stream()
// .filter(f -> !f.getRelKey().equals(strGuid))
// .collect(Collectors.toList()).forEach(m -> {
// m.setVirtualSlabNo(virtualSlabNo);
// subService.InsertPmSubOrdDO(m);
// });
// gltSelGGrpCalRslt.stream()
// .filter(f -> !f.getRelKey().equals(strGuid))
// .collect(Collectors.toList()).forEach(m -> {
// m.setVirtualSlabNo(virtualSlabNo);
//
// });
//
// });
}
@ -2004,7 +2033,7 @@ public class SubController {
// 生成虚拟板坯号的方法保存
private String generateVirtualSlabNoSave(String pono, int i) {
return pono + "S9" + String.format("%03d", i + 1);
return pono + "S9" + String.format("%03d", i );
}
@ -2318,14 +2347,14 @@ public class SubController {
pmPdContSumDO.setProContId(gPreOrders.get(0).getInfoPmProContDo().getProContId());
pmPdContSumDO.setOrderThick(gPreOrders.get(0).getThk());
pmPdContSumDO.setOrderWidth(BigDecimal.valueOf(gPreOrders.get(0).getWid()));
pmPdContSumDO.setOrderLen(BigDecimal.valueOf(gPreOrders.get(0).getIntActLen())); //20250212
pmPdContSumDO.setOrderLen(BigDecimal.valueOf(gPreOrders.get(0).getLen())); //20250212
pmPdContSumDO.setOrderLenMax(BigDecimal.valueOf(gPreOrders.get(0).getInfoPmProContProdAttrDO().getOrderMaxLen()));
pmPdContSumDO.setOrderLenMin(BigDecimal.valueOf(gPreOrders.get(0).getInfoPmProContProdAttrDO().getOrderMinLen()));
pmPdContSumDO.setSmallPlateThick(gPreOrders.get(0).getThk());
pmPdContSumDO.setSmallPlateWidth(BigDecimal.valueOf(gPreOrders.get(0).getWid()));
pmPdContSumDO.setSmallPlateLen(BigDecimal.valueOf(gPreOrders.get(0).getIntActLen()));//TODO 长度不确定用实际长度还是长度
pmPdContSumDO.setSmallPlateLen(BigDecimal.valueOf(gPreOrders.get(0).getLen()));//TODO 长度不确定用实际长度还是长度
pmPdContSumDO.setCreatedBy(781L);//TODO 创建人修改人，暂时默认781 BKGY
pmPdContSumDO.setLastUpdatedBy(781L);
@ -2362,13 +2391,13 @@ public class SubController {
pmSmallPltPosDO.setPickModeWidDir(0);//TODO 取板方式 宽度方向 不知道怎么取暂时默认为0
pmSmallPltPosDO.setOrderThick(gpo.getThk());
pmSmallPltPosDO.setOrderWidth(BigDecimal.valueOf(gpo.getWid()));
pmSmallPltPosDO.setOrderLen(gpo.getIntActLen()); //TODO 长度不确定用实际长度还是长度
pmSmallPltPosDO.setOrderLen(gpo.getLen()); //TODO 长度不确定用实际长度还是长度
pmSmallPltPosDO.setOrderLenMax(gpo.getInfoPmProContProdAttrDO().getOrderMaxLen());
pmSmallPltPosDO.setOrderLenMin(gpo.getInfoPmProContProdAttrDO().getOrderMinLen());
pmSmallPltPosDO.setSmallPlateThick(gpo.getThk());
pmSmallPltPosDO.setSmallPlateWidth(BigDecimal.valueOf(gpo.getWid()));
pmSmallPltPosDO.setSmallPlateLen(gpo.getIntActLen()); //TODO 长度不确定用实际长度还是长度
pmSmallPltPosDO.setSmallPlateLen(gpo.getLen()); //TODO 长度不确定用实际长度还是长度
pmSmallPltPosDO.setCreatedBy(781L);//TODO 创建人修改人，暂时默认781 BKGY
pmSmallPltPosDO.setLastUpdatedBy(781L);

Write Preview
Loading…
Cancel
Save