Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -382,4 +382,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     Date getOrderPrintDate(BigDecimal orderId);
 
+    String getPrintFlag();
+
 }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -2060,6 +2060,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         switch (orderType){
             case 1:
                  mesMap = omstruckOrderMapper.getSteelOrderMessageToApp(map);
+                 if("true".equals(omstruckOrderMapper.getPrintFlag()) && DataChange.dataToBigDecimal(mesMap.get("printNumber")).intValue()>0){
+                     mesMap.put("orderLineSequence",DataChange.dataToBigDecimal(mesMap.get("orderLineSequence")).intValue()+1);
+                 }
                  steelJudge = "steel";
                  break;
             case 4:

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -3359,8 +3359,6 @@
         LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
         WHERE
-        ASO.DELETED = 0
-        and
         OO.ORDER_ID = #{orderId}
         AND rownum =1
         <if test="status == null">
@@ -3959,7 +3957,8 @@
         OO.ORDER_STATUS "orderStatus",
         ASO.SALE_ORDER_ID   "saleOrderId",
         OO.DELETED  "orderDeleted",
-        OO.UPDATE_USERNAME "deleteReason"
+        OO.UPDATE_USERNAME "deleteReason",
+        OO.PRINTNUMBER "printNumber"
         FROM
         OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -3981,8 +3980,7 @@
         RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
         ) TEMP ON TEMP."orderId"=OO.ORDER_ID
         WHERE
-        ASO.DELETED = 0
-        AND OO.ORDER_ID = #{orderId}
+        OO.ORDER_ID = #{orderId}
         AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS between 4 and 6
@@ -4381,4 +4379,8 @@
         SELECT OO.PRINTDATE FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getPrintFlag" resultType="java.lang.String">
+        SELECT DILV.VERSION_VALUE FROM DIL_VERSION DILV
+        WHERE DILV.VERSION_ID = 7
+    </select>
 </mapper>