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 1e56723..72e220c 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
@@ -2396,7 +2396,7 @@ public class SubController {
                 pmPdContSumDO.setCreationDate(now);
                 pmPdContSumDO.setLastUpdateDate(now);
                 pmPdContSumDO.setAxisFlag(0);//TODO 轴合同标记，暂时默认0
-                SetPmCmdCont(pmPdContSumDO, gPreOrders.get(0));//命令参数表
+                SetPmCmdCont(pmPdContSumDO, gPreOrders.get(0),ggcr.getLtActInfoGPreOrder().size());//命令参数表
                 pmPdContSumDOList.add(pmPdContSumDO);
             }
         }
@@ -2460,14 +2460,14 @@ public class SubController {
         pmCmdSlabDO.setOrderRemainDiv(pmPdSlabDO.getOrderRemainDiv());
         pmCmdSlabDO.setMatDesignKind("S");
         pmCmdSlabDO.setProdCodeHp("");//TODO 厚板品种代码 暂时默认为空
-        pmCmdSlabDO.setSgSign(pmCmdSlabDO.getSgSign());
-        pmPdSlabDO.setStNo(pmPdSlabDO.getStNo());
+        pmCmdSlabDO.setSgSign(pmPdSlabDO.getSgSign());
+        pmCmdSlabDO.setStNo(pmPdSlabDO.getStNo());
         pmCmdSlabDO.setPreCleanSlabThick(pmPdSlabDO.getPreCleanSlabThick());
         pmCmdSlabDO.setPreCleanSlabWidth(pmPdSlabDO.getPreCleanSlabWidth());
         pmCmdSlabDO.setPreCleanSlabLen(pmPdSlabDO.getPreCleanSlabLen());
         pmCmdSlabDO.setPreCleanSlabMaxLen(pmPdSlabDO.getPreCleanSlabMaxLen());
         pmCmdSlabDO.setPreCleanSlabMinLen(pmPdSlabDO.getPreCleanSlabMinLen());
-        pmCmdSlabDO.setPreCleanSlabWt(pmPdSlabDO.getPreCleanSlabWt());
+        pmCmdSlabDO.setPreCleanSlabWt(pmPdSlabDO.getPreCleanSlabWt().divide(BigDecimal.valueOf(1000000000), 3, RoundingMode.HALF_UP));
         pmCmdSlabDO.setPreCleanSlabMaxWt(pmPdSlabDO.getPreCleanSlabMaxWt());
         pmCmdSlabDO.setPreCleanSlabMinWt(pmPdSlabDO.getPreCleanSlabMinWt());
         Long slabPdQty = plistPmPdSlabInfoDO.stream()
@@ -2487,11 +2487,11 @@ public class SubController {
         pmCmdSlabDO.setInfurSlabLen(pmPdSlabDO.getInfurSlabLen());
         pmCmdSlabDO.setInfurSlabMaxLen(pmPdSlabDO.getInfurSlabMaxLen());
         pmCmdSlabDO.setInfurSlabMinLen(pmPdSlabDO.getInfurSlabMinLen());
-        pmCmdSlabDO.setInfurSlabWt(pmPdSlabDO.getInfurSlabWt());
+        pmCmdSlabDO.setInfurSlabWt(pmPdSlabDO.getInfurSlabWt().divide(BigDecimal.valueOf(1000000000), 3, RoundingMode.HALF_UP));
         pmCmdSlabDO.setInfurSlabMaxWt(pmPdSlabDO.getInfurSlabMaxWt());
-        pmCmdSlabDO.setInfurSlabMinWt(pmPdSlabDO.getInfurSlabMinWt());
+        pmCmdSlabDO.setInfurSlabMinWt(pmPdSlabDO.getInfurSlabLen());
         pmCmdSlabDO.setNeedSlabLen(pmPdSlabDO.getNeedSlabLen());
-        pmCmdSlabDO.setNeedSlabWt(pmPdSlabDO.getNeedSlabWt());
+        pmCmdSlabDO.setNeedSlabWt(pmPdSlabDO.getInfurSlabWt().divide(BigDecimal.valueOf(1000000000), 3, RoundingMode.HALF_UP));
         pmCmdSlabDO.setFixSlabLenFlag(String.valueOf(pmPdSlabDO.getFixSlabLenFlag()));
         pmCmdSlabDO.setFixSlabLen(pmPdSlabDO.getFixSlabLen().intValue());
         pmCmdSlabDO.setSlabPlaceCode(pmPdSlabDO.getSlabPlaceCode());
@@ -2500,7 +2500,7 @@ public class SubController {
         pmCmdSlabDO.setCoolCode(pmPdSlabDO.getCoolCode());
         pmCmdSlabDO.setLastSlabFlag(String.valueOf(pmPdSlabDO.getLastSlabFlag()));
         pmCmdSlabDO.setAddSlabFlag(pmPdSlabDO.getAddSlabFlag());
-        pmCmdSlabDO.setSlabPreProc1(""); //TODO  板坯预定通过工序1  文档中没有 有合同分割取值逻辑 暂时默认为空
+        pmCmdSlabDO.setSlabPreProc1(""); //TODO  板坯预定通过工序1  文档中没有 有取合同分割值逻辑 暂时默认为空
         pmCmdSlabDO.setHotSendDiv("H");
         pmCmdSlabDO.setFurType(pmPdSlabDO.getFurType());
         pmCmdSlabDO.setHotChargeFlag("0");
@@ -2551,7 +2551,6 @@ public class SubController {
         pmCmdLargePltDO.setHeadCut(pmPdSlabDO.getHeadCut().intValue());
         pmCmdLargePltDO.setTailCut(pmPdSlabDO.getTailCut().intValue());
         pmCmdLargePltDO.setSgSign(gGrpCalRslt.getLtActInfoGPreOrder().get(0).getInfoPmProContProdAttrDO().getSgSign());//TODO 轴合同的标准牌号 暂时取第一条合同信息
-        pmCmdLargePltDO.setSgSign(gGrpCalRslt.getLtActInfoGPreOrder().get(0).getInfoPmProContProdAttrDO().getSgSign());
         pmCmdLargePltDO.setStNo(pmPdSlabDO.getStNo());
         pmCmdLargePltDO.setTwoRollInterimFlag(String.valueOf(pmPdSlabDO.getTwoRollInterimFlag()));
         pmCmdLargePltDO.setRollAimThick(pmPdSlabDO.getRollAimThick());
@@ -2574,7 +2573,7 @@ public class SubController {
         pmCmdLargePltDO.setOrder1Thick(pmPdSlabDO.getOrderThickAxis());
         pmCmdLargePltDO.setCombinePlateWidth(pmPdSlabDO.getCombinePlateWidth());
         pmCmdLargePltDO.setCombinePlateLen(pmPdSlabDO.getCombinePlateLen());
-        pmCmdLargePltDO.setRollWtHp(pmPdSlabDO.getRollWtHp());
+        pmCmdLargePltDO.setRollWtHp(pmPdSlabDO.getRollWtHp().divide(BigDecimal.valueOf(1000000000), 3, RoundingMode.HALF_UP));
         pmCmdLargePltDO.setNormYield(pmPdSlabDO.getNormYield());
         pmCmdLargePltDO.setCommandYield(pmPdSlabDO.getCommandYield());
         pmCmdLargePltDO.setRollYield(pmPdSlabDO.getRollYield());
@@ -2616,8 +2615,9 @@ public class SubController {
     }
 
     //命令参数表
-    public void SetPmCmdCont(PmPdContSumDO pmPdContSumDO, GPreOrder gPreOrder) {
+    public void SetPmCmdCont(PmPdContSumDO pmPdContSumDO, GPreOrder gPreOrder,Integer smallPlateNum) {
         PmCmdContDO pmCmdContDO = new PmCmdContDO();
+        pmCmdContDO.setSmallPlateNum(smallPlateNum);
         pmCmdContDO.setPonoSlabNo(pmPdContSumDO.getPdMatNo());
         pmCmdContDO.setTmpSlabNo(pmPdContSumDO.getPdMatNo());
         pmCmdContDO.setOrderNo(pmPdContSumDO.getOrderNo());
@@ -2675,6 +2675,7 @@ public class SubController {
         pmCmdContDO.setOrderLenMin(BigDecimal.valueOf(gPreOrder.getInfoPmProContProdAttrDO().getOrderMinLen()));
         pmCmdContDO.setOrderLenMax(BigDecimal.valueOf(gPreOrder.getInfoPmProContProdAttrDO().getOrderMaxLen()));
         pmCmdContDO.setSmallPlateThick(pmPdContSumDO.getSmallPlateThick());
+        pmCmdContDO.setSgSign(pmPdSlabDOItem.get().getSgSign());
         pmCmdContDO.setSmallPlateWidth(pmPdContSumDO.getSmallPlateWidth());
         pmCmdContDO.setSmallPlateLen(pmPdContSumDO.getSmallPlateLen());
         pmCmdContDO.setTrimCode(gPreOrder.getInfoPmProContProdAttrDO().getTrimCode());
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 51e6716..dc98a87 100644
--- a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
+++ b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
@@ -80,7 +80,7 @@
         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
-        AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
+--         AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
         WHERE 1=1
 --         AND ppc.ORDER_NO='522484Q020'
         AND  PCMT.FUR_TYPE ='C'  --加热炉类型  C   没有注解，C和S 都代表什么
@@ -88,7 +88,7 @@
         AND  PPC.ON_PD_FLAG != 1 --不用验证操作者
         AND  PPC.PD_HOLD_FLAG != 1 -- 不能封锁状态
         AND  pcmt.ROLL_DIRECT_CODE ='L' --轧制方向代码
-        AND NVL(cm.ORDER_STATUS,0) >=40 AND NVL(cm.ORDER_STATUS,0) < 67  --TODO 添加nvl处理 表中无效数字
+        AND NVL(cm.ORDER_STATUS,0) >= 40 AND NVL(cm.ORDER_STATUS,0) < 67  --TODO 添加nvl处理 表中无效数字
 --      AND  PPC.PD_LACK_QTY > 0  --欠量大于0 TODO 存在欠量小于0的数据
     </select>
 
@@ -100,7 +100,7 @@
         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
-        AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
+--         AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
         WHERE 1=1
         -- AND ppc.ORDER_NO='522484Q020'
         AND  PCMT.FUR_TYPE ='C'  --加热炉类型  C   没有注解，C和S 都代表什么
@@ -108,7 +108,7 @@
         AND  PPC.ON_PD_FLAG != 1 --不用验证操作者
         AND  PPC.PD_HOLD_FLAG != 1 -- 不能封锁状态
         AND  pcmt.ROLL_DIRECT_CODE ='L'--轧制方向代码
-         AND NVL(cm.ORDER_STATUS,0) >=40 AND NVL(cm.ORDER_STATUS,0) &lt; 67  --TODO 添加nvl处理 表中无效数字
+         AND NVL(cm.ORDER_STATUS,0) &gt;= 40 AND NVL(cm.ORDER_STATUS,0) &lt; 67  --TODO 添加nvl处理 表中无效数字
 --         AND  PPC.PD_LACK_QTY &gt; 0  --欠量大于0 TODO 存在欠量小于0的数据
 
     </select>
@@ -1089,6 +1089,21 @@
         PM_CMD_LARGE_PLT_ID,
         <if test="ponoSlabNo != null">PONO_SLAB_NO,</if>
         <if test="tmpSlabNo != null">TMP_SLAB_NO,</if>
+        <if test="pdBacklogCode != null">PD_BACKLOG_CODE,</if>
+        <if test="plateNo != null">PLATE_NO,</if>
+        <if test="slabNo != null">SLAB_NO,</if>
+        <if test="slabDivNo != null">SLAB_DIV_NO,</if>
+        <if test="pdStatusHp != null">PD_STATUS_HP,</if>
+        <if test="formPlateMode != null">FORM_PLATE_MODE,</if>
+        <if test="pickModeLenDir != null">PICK_MODE_LEN_DIR,</if>
+        <if test="pickModeWidDir != null">PICK_MODE_WID_DIR,</if>
+        <if test="furType != null">FUR_TYPE,</if>
+        <if test="autoManualFlag != null">AUTO_MANUAL_FLAG,</if>
+        <if test="orderRemainDiv != null">ORDER_REMAIN_DIV,</if>
+        <if test="matDesignKind != null">MAT_DESIGN_KIND,</if>
+        <if test="orderNumInPlate != null">ORDER_NUM_IN_PLATE,</if>
+        <if test="totSmallPlateNum != null">TOT_SMALL_PLATE_NUM,</if>
+        <if test="prodCodeHp != null">PROD_CODE_HP,</if>
         <if test="adTypeCode != null">AD_TYPE_CODE,</if>
         <if test="adModeCode != null">AD_MODE_CODE,</if>
         <if test="ultCode != null">ULT_CODE,</if>
@@ -1186,7 +1201,7 @@
         <if test="plateDtCode != null">PLATE_DT_CODE,</if>
         <if test="traceCode != null">TRACE_CODE,</if>
         <if test="minCr1Thick != null">MIN_CR1_THICK,</if>
-        <if test="cr1TempAim != null">CR1_TEMP_AIM</if>
+        <if test="cr1TempAim != null">CR1_TEMP_AIM,</if>
         <if test="maxCr1Temp != null">MAX_CR1_TEMP,</if>
         <if test="minCr1Temp != null">MIN_CR1_TEMP,</if>
         <if test="minPressBefcr1 != null">MIN_PRESS_BEF_CR1,</if>
@@ -1294,6 +1309,22 @@
         PM_CMD_LARGE_PLT_S.NEXTVAL,
         <if test="ponoSlabNo != null">#{ponoSlabNo},</if>
         <if test="tmpSlabNo != null">#{tmpSlabNo},</if>
+        <if test="pdBacklogSeq != null">#{pdBacklogSeq},</if>
+        <if test="pdBacklogCode != null">#{pdBacklogCode},</if>
+        <if test="plateNo != null">#{plateNo},</if>
+        <if test="slabNo != null">#{slabNo},</if>
+        <if test="slabDivNo != null">#{slabDivNo},</if>
+        <if test="pdStatusHp != null">#{pdStatusHp},</if>
+        <if test="formPlateMode != null">#{formPlateMode},</if>
+        <if test="pickModeLenDir != null">#{pickModeLenDir},</if>
+        <if test="pickModeWidDir != null">#{pickModeWidDir},</if>
+        <if test="furType != null">#{furType},</if>
+        <if test="autoManualFlag != null">#{autoManualFlag},</if>
+        <if test="orderRemainDiv != null">#{orderRemainDiv},</if>
+        <if test="matDesignKind != null">#{matDesignKind},</if>
+        <if test="orderNumInPlate != null">#{orderNumInPlate},</if>
+        <if test="totSmallPlateNum != null">#{totSmallPlateNum},</if>
+        <if test="prodCodeHp != null">#{prodCodeHp},</if>
         <if test="adTypeCode != null">#{adTypeCode},</if>
         <if test="adModeCode != null">#{adModeCode},</if>
         <if test="ultCode != null">#{ultCode},</if>