diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
index b5a659d..a354326 100644
--- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
+++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
@@ -223,11 +223,11 @@ public class SubController {
     public JsonData SubData(String strSlab) {
         SubParams subParams = new SubParams();
         subParams.setSlabNo(strSlab);
-//
-//        if (strSlab==null || strSlab=="")
-//        {
-//            return null;
-//        }
+        //测试阶段需要指定板坯号
+        if (strSlab==null || strSlab=="")
+        {
+            return null;
+        }
         //获取所有数据
         GetDataInfo(subParams);
 
@@ -1491,10 +1491,10 @@ public class SubController {
 
         //TODO:箭头函数订单多线程处理数据，升序，降序，重组。
         //使用 Stream.parallel() 来并行执行 for 循环  OrderNo  升序   PdLackQty 降序
-        plistOrder.parallelStream()
-                .sorted(Comparator.comparing(PmProContDO::getOrderNo)
-                        .thenComparing(Comparator.comparing(PmProContDO::getPdLackQty).reversed()))
-                .forEach(i -> {
+//        plistOrder.parallelStream()
+//                .sorted(Comparator.comparing(PmProContDO::getOrderNo)
+//                        .thenComparing(Comparator.comparing(PmProContDO::getPdLackQty).reversed()))
+        plistOrder.parallelStream().forEach(i -> {
                     PmProContProdAttrDO ppcpa = new PmProContProdAttrDO();
 
                     PmContMscTechDO pcmt = new PmContMscTechDO();
@@ -1524,13 +1524,16 @@ public class SubController {
                                 return;
                             }
 
-                            if (plistPmContMscTechDO.stream().filter(p -> p.getOrderNo().equals(i.getOrderNo()) && p.getMscLineNo().equals("1030")).count() > 0) {
+                            if (plistPmContMscTechDO.stream().filter(p -> p.getOrderNo().equals(i.getOrderNo())).count() > 0) {
                                 // 可能抛出异常的代码
                                 pcmt = plistPmContMscTechDO.stream().filter(p -> p.getOrderNo().equals(i.getOrderNo())).findFirst().orElseThrow(() -> new NoSuchElementException("No PmContMscTechDO found with name Charlie  " + i.getOrderNo()));
+                                if (plistQdToPoOrderDO.stream().anyMatch(e ->e.getOrderNo().equals(i.getOrderNo())))
+                                {
+                                    qtpo=plistQdToPoOrderDO.stream().filter(e -> e.getOrderNo().equals(i.getOrderNo())).findFirst().orElseThrow(() -> new NoSuchElementException("No PmContMscTechDO found with name Charlie  " + i.getOrderNo()));
 
-                                qtpo=plistQdToPoOrderDO.stream().filter(p -> p.getOrderNo().equals(i.getOrderNo())).findFirst().orElseThrow(() -> new NoSuchElementException("No PmContMscTechDO found with name Charlie  " + i.getOrderNo()));
+                                    SetAllOrder(i, ppcpa, pcmt,qtpo);
+                                }
 
-                                SetAllOrder(i, ppcpa, pcmt,qtpo);
                             } else {
 //                                logger.info("缺少产线信息：" + i.getOrderNo());
                             }
@@ -1538,7 +1541,7 @@ public class SubController {
 //                            logger.info("缺少属性信息：" + i.getOrderNo());
                         }
 
-                    } catch (NullPointerException ex1) {
+                    } catch (Exception ex1) {
                         System.out.println("错误信息：" + ex1.getMessage());
                     }
                 });
@@ -1909,7 +1912,7 @@ public class SubController {
                 p.setEff_Len(intSumOrderLen + intSumPlateCutWid);
 
                 PmPlateCutLenBtDO PPCLB_Act = plistPmPlateCutLenBtDO.stream().
-                        filter(f -> f.getMscLineNo().equals("1030")
+                        filter(f -> f.getMscLineNo().equals(SInfo.getMscLineNo())
                                 && f.getBrrNeed().equals((p.getCal_Wid() > SInfo.getRemWid().intValue()) ? "1" : "0")
                                 && f.getPlateThickFrom().compareTo(p.getCal_Thk()) <= 0
                                 && f.getPlateThickTo().compareTo(p.getCal_Thk()) >= 0
@@ -2467,7 +2470,7 @@ public class SubController {
                     .map(gPreOrder -> BigDecimal.valueOf(gPreOrder.getWid()).multiply(gPreOrder.getThk()).multiply(BigDecimal.valueOf(gPreOrder.getLen())))
                     .reduce(BigDecimal.ZERO, BigDecimal::add))
                     .multiply(BigDecimal.valueOf(7.85))
-                    .divide(weight, 2, RoundingMode.HALF_UP);
+                    .divide(weight.multiply( BigDecimal.valueOf(1000000000)), 4, RoundingMode.HALF_UP);
             pmPdSlabDO.setCommandYield(yield);
             pmPdSlabDO.setNormYield(yield);
             pmPdSlabDO.setRollYield(yield);
@@ -2487,7 +2490,7 @@ public class SubController {
             }
 
             pmPdSlabDO.setOrderNoAxis(ggcr.getLtActInfoGPreOrder().get(0).getOrderNo());//TODO 轴合同号 暂时取第一个订单号
-            pmPdSlabDO.setMscLineNo("1030"); //TODO 产线号，暂时默认1030
+            pmPdSlabDO.setMscLineNo(SInfo.getMscLineNo()); //TODO 产线号，暂时默认板坯产线号
 
             pmPdSlabDO.setTransFlag(BigDecimal.valueOf(0));
 
diff --git a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
index d0f385e..f0b5cf3 100644
--- a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
+++ b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
@@ -95,9 +95,9 @@
 
     <select id="getQdToPoOrder" resultType="net.xdclass.shopmanager.model.QdToPoOrderDO">
 
-        SELECT QTPO.* FROM PM_PRO_CONT ppc
+        SELECT QTPO.* FROM XISC_QD.QD_TO_PO_ORDER QTPO
+                               LEFT JOIN PM_PRO_CONT ppc ON QTPO.ORDER_NO = PPC.ORDER_NO
                                LEFT JOIN XISC_CT.CT_MAIN CM ON PPC.ORDER_NO = CM.ORDER_NO
-                               LEFT JOIN XISC_QD.QD_TO_PO_ORDER QTPO ON QTPO.ORDER_NO = PPC.ORDER_NO
                                LEFT JOIN PM_PRO_CONT_PROD_ATTR ppcpa ON ppcpa.ORDER_NO = ppc.ORDER_NO
                                LEFT JOIN PM_CONT_MSC_TECH PCMT ON PCMT.ORDER_NO = ppc.ORDER_NO
             AND ppc.PRO_CONT_ID = pcmt.PRO_CONT_ID