Merge remote-tracking branch 'origin/master'

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

@@ -146,4 +146,8 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     List<String> getEasPrimaryIds(String orderNumber);
 
+    String getPrintFlag();
+
+    int getPrintNumber(BigDecimal orderId);
+
 }

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

@@ -268,6 +268,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 throw new Exception("该车未扫卸货，请提醒司机去补扫卸货");
             }
         }
+        if(orderType == 1 && "true".equals(tmstruckLeaveFactoryResultMapper.getPrintFlag())) {
+                //如果是钢材订单,且打印送货单是必须打印,那么进这个方法
+            Integer printNumber = tmstruckLeaveFactoryResultMapper.getPrintNumber(DataChange.dataToBigDecimal(mesMap.get("orderId")));
+            if(printNumber == 0){
+                throw new Exception("未打印送货单,请提醒司机去打印");
+            }
+        }
         map.putAll(mesMap);
         map.putAll(selectMap);
         map.remove("Sqe");

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

@@ -1914,6 +1914,7 @@
                     ASO.SALE_ORDER_ID "saleOrderId",
                     ASM.SALE_MAKE_DATE  "saleMakeDate",
                     to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') "orderTime",
+                    ASO.INSERT_UPDATE_REMARK "saleOrderInertUpdateRemark",
                     ASO.SALE_NUMBER "saleOrderNo",
                     ASO.UPDATE_TIME "updateTime",
                     ASM.SALE_MATERIAL_ID "saleMaterialId",
@@ -1973,6 +1974,11 @@
                     TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
                     TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
                     ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
+                    (CASE WHEN
+                        ASM.IS_POUND_SALE = 0
+                        THEN NULL
+                        else ASM.MATERIAL_WEIGHT
+                        END) "materialThoWeight",
                     R_CARRIER.CARRIER_ID        "carrierId",
                     (CASE WHEN
                         RCA.CAPACITY_NUMBER = '空白'
@@ -1985,15 +1991,21 @@
                     OO.CAN_WORK     "canwork",
                     OO.ORDER_STATUS              "carStatus",
                     RSA.AREA_NAME "areaName",
+                    OO.INSERT_UPDATE_REMARK "orderInsertUpdateRemark",
                     TAR.INSERT_TIME "arrivalTime",
                     TRR.INSERT_TIME "receiptTime",
                     ASO.sale_remark "saleRemark",
                     DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
                     decode(TSR.RESULT_ID,null,'未发送','已发送')  "smsResultId",
-                    DECODE(ASO.SALE_ORDER_STATUS,1,'保存',
-                                                 2,'提交',
-                                                 4,'审核',
-                                                 0,'未上报') "saleOrderStatus",
+                    (CASE WHEN
+                        ASO.DELETED = 2 then '关闭'
+                    when ASO.DELETED = 1 then '反审批'
+                    when ASO.SALE_ORDER_STATUS = 4 then '审核'
+                    when ASO.SALE_ORDER_STATUS = 2 then '提交'
+                    when ASO.SALE_ORDER_STATUS = 1 then '保存'
+                    when ASO.SALE_ORDER_STATUS = 0 then '未上报'
+                    END
+                    ) "saleOrderStatus",
                     (CASE
                     when OO.ORDER_STATUS =2
                     then '已完成'
@@ -2075,7 +2087,6 @@
                     LEFT JOIN TMSTRUCK_SMS_RUSULT TSR
                               ON TSR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
                     WHERE ASO.SALE_TYPE = 1
-                          AND ASO.DELETED = 0
                           and ASM.SALE_MATERIAL_ID IS NOT NULL
                     <if test="oneDate != null">
                         and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
@@ -2187,10 +2198,15 @@
                     </if>
                     <if test="saleOrderStatusList != null">
                         and <foreach collection="saleOrderStatusList" item="item" open="(" separator="or" close=")">
-                        DECODE(ASO.SALE_ORDER_STATUS,1,'保存',
-                        2,'提交',
-                        4,'审核',
-                        0,'未上报') like '%${item}%'
+                        (CASE WHEN
+                        ASO.DELETED = 2 then '关闭'
+                        when ASO.DELETED = 1 then '反审批'
+                        when ASO.SALE_ORDER_STATUS = 4 then '审核'
+                        when ASO.SALE_ORDER_STATUS = 2 then '提交'
+                        when ASO.SALE_ORDER_STATUS = 1 then '保存'
+                        when ASO.SALE_ORDER_STATUS = 0 then '未上报'
+                        END
+                        ) like '%${item}%'
                     </foreach>
                     </if>
                     <if test="saleRemarkList != null">

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

@@ -1486,4 +1486,12 @@
           AND TWR.RESULT_NET_WEIGHT IS NOT NULL
           AND oo.order_number = #{orderNumber}
     </select>
+    <select id="getPrintFlag" resultType="string">
+        SELECT DILV.VERSION_VALUE FROM DIL_VERSION DILV
+        WHERE DILV.VERSION_ID = 7
+    </select>
+    <select id="getPrintNumber" resultType="java.lang.Integer">
+        SELECT OO.PRINTNUMBER FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>