2025-02-17

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java

@@ -291,17 +291,18 @@ public class SubController {
 
                             SetGroupCalRslt(p);
 
-                    //存储数据，组板结果
-                    SaveHisData(p);
-
                             logger.info("结果数据板坯号：{}；数量：{}", p.getSlabNo(), gltGGrpCalRslt.size());
                         }
                         if (gltSelGGrpCalRslt.size() > 0) {
                             now = new Date();
+                            //数据整理
                             SetSaveDate(p);
                             //开启事务
                             TransactionStatus transactionStatus = transactionService.begin();
                             try {
+                                //存储数据，组板结果
+                                SaveHisData(p);
+                                //保存数据
                                 SaveData();
                                 //bOffTaskLineService.saveOffTask(bPlanHeadAndLineVos);
                                 transactionService.commit(transactionStatus);
@@ -330,12 +331,13 @@ public class SubController {
         //存储数据，组板结果
         plistpmSubHisDO.forEach(e -> {
 
+            String strMaxSeq = subService.GetMaxSeq(SInfo.getPono());
             //TODO:未获取轧制命令最大序号
-            int intSeq = 1;//Integer.parseInt(subService.GetMaxSeq().substring(subService.GetMaxSeq().length() - 4));
+            int intSeq = Integer.parseInt(strMaxSeq.substring(strMaxSeq.length() - 3));
 
             String virtualSlabNo = generateVirtualSlabNoSave(e.getVirtualSlabNo(), intSeq);
 
-            String strGuid = e.getVirtualSlabNo();
+            String strGuid = e.getRelKey();
 
             //获取虚拟板坯号
             e.setVirtualSlabNo(virtualSlabNo);
@@ -343,7 +345,7 @@ public class SubController {
             subService.InsertPmSubHisDO(e);
             //删选plistpmSubOrdDO中虚拟板坯号等于strGuid的信息
             plistpmSubOrdDO.stream()
-                    .filter(f -> !f.getVirtualSlabNo().equals(strGuid))
+                    .filter(f -> !f.getRelKey().equals(strGuid))
                     .collect(Collectors.toList()).forEach(m -> {
                         m.setVirtualSlabNo(virtualSlabNo);
                         subService.InsertPmSubOrdDO(m);
@@ -623,8 +625,7 @@ public class SubController {
         logger.info("30:订单合约信息信息：" + plistQdToPoOrderDO.size());
 
         logger.info("获取基础数据完成");
-        if (plistpmAutoSubSettingDO.size()>0)
+        if (plistpmAutoSubSettingDO.size() > 0) {
-        {
             logger.info("配置信息-》 是否启动      ：{}", plistpmAutoSubSettingDO.get(0).getIsStartFlag());
             logger.info("配置信息-》 启动时间范围   ：{}~{}", plistpmAutoSubSettingDO.get(0).getStartTime(), plistpmAutoSubSettingDO.get(0).getEndTime());
             logger.info("配置信息-》 优先模式      ：{}", plistpmAutoSubSettingDO.get(0).getPriMode());
@@ -1363,8 +1364,7 @@ public class SubController {
                                             && p.getOrderThickMin().intValue() <= finalPpcpa.getOrderThick().intValue()
                                             && finalPpcpa.getOrderThick().intValue() <= p.getOrderThickMax().intValue()
                                             && p.getDelivyDateFrom().compareTo(finalPpcpa.getDelivyDate()) <= 0
-                                    && finalPpcpa.getDelivyDate().compareTo(p.getDelivyDateTo())<=0).count()<=0)
+                                            && finalPpcpa.getDelivyDate().compareTo(p.getDelivyDateTo()) <= 0).count() <= 0) {
-                            {
                                 logger.info("订单：{} 不可自动组板，尺寸厚度{},宽度{},交货期{} 不在范围内", i.getOrderNo(), finalPpcpa.getOrderThick(), finalPpcpa.getOrderWidth(), new SimpleDateFormat("yyyy-MM-dd").format(finalPpcpa.getDelivyDate()));
                                 return;
                             }
@@ -1909,6 +1909,7 @@ public class SubController {
 
                         // 生成虚拟板坯号
                         pmSubOrdDO.setVirtualSlabNo(virtualSlabNo); // 虚拟板坯号
+                        pmSubOrdDO.setRelKey(virtualSlabNo); // 关系号
                         pmSubOrdDO.setSlabNo(SInfo.getSlabNo()); // 板坯号
 
                         // 手动为每个字段赋值
@@ -1995,7 +1996,6 @@ public class SubController {
     }
 
 
-
     //设置保存数据
     public void SetSaveDate(SlabInfoDO SInfo) {
         SetPmPdSlab(SInfo);//组板板坯表 命令板坯表 命令大板表

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java

@@ -141,4 +141,6 @@ public interface SubMapper extends BaseMapper<Map> {
     BigDecimal getMaxPmCmdContId();
 
     void insertPmCmdCont(PmCmdContDO pmCmdContDO);
+
+    String GetMaxSeq(String pono);
 }

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java

@@ -119,4 +119,6 @@ public interface SubService  {
     void batchInsertPmCmdSmallPlt(List<PmCmdSmallPltDO> pmCmdSmallPltDOList);
 
     void batchInsertPmCmdCont(List<PmCmdContDO> pmCmdContDOList);
+
+    String GetMaxSeq(String pono);
 }

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java

@@ -355,5 +355,10 @@ public class SubServiceImpl implements SubService {
         }
     }
 
+    @Override
+    public String GetMaxSeq(String pono) {
+        return  subMapper.GetMaxSeq(pono);
+    }
+
 
 }

1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml

@@ -277,6 +277,12 @@
 
     </select>
 
+    <select id="GetMaxSeq" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT NVL(MAX(VIRTUAL_SLAB_NO), 0)
+        FROM PM_PD_SLAB
+        WHERE PONO=#{pono}
+    </select>
+
     <insert id="InsertPmSubOrdDO" parameterType="net.xdclass.shopmanager.model.PmSubOrdDO" keyProperty="id">
         INSERT INTO PM_SUB_ORD (ORDER_NO, VIRTUAL_SLAB_NO, SG_SIGN, ST_NO, ORDER_THICK, ORDER_WIDTH,
                                 LEN_AIM, POS_X, POS_Y, DELIVY_DATE, AXIS_ORD, LACK_NUM, OVER_NUM,