md

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java

@@ -638,9 +638,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         // 运单修改
         else{
 
-            // 判断是否是接单
+            // 判断是否是接单,如果订单状态为0，则需要做接单操作
-            boolean isConfirmOrder=false;
+            if("0".equals(emisWaybillOld.getOrderStatus())){
-            if("1".equals(emisWaybillOld.getOrderStatus())){
                 emisWaybillSave.setId(emisWaybillOld.getId());
                 emisWaybillSave.setOrderSn(emisWaybillOld.getOrderSn());
 

emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml

@@ -663,6 +663,14 @@
 
             </if>
 
+
+            <if test="params.beginOrderDate != null and params.beginOrderDate != ''">
+                and a.order_date <![CDATA[ >= ]]>  #{params.beginOrderDate}
+            </if>
+            <if test="params.endOrderDate != null and params.endOrderDate != ''">
+                and a.order_date <![CDATA[ <= ]]>  #{params.endOrderDate}
+            </if>
+
             <if test="payee != null  and payee != ''">
                 or a.payee=#{payee}
              </if>
@@ -970,6 +978,22 @@
             </if>
 
 
+            <if test="params.beginOrderDate != null and params.beginOrderDate != ''">
+                and a.order_date <![CDATA[ >= ]]>  #{params.beginOrderDate}
+            </if>
+            <if test="params.endOrderDate != null and params.endOrderDate != ''">
+                and a.order_date <![CDATA[ <= ]]>  #{params.endOrderDate}
+            </if>
+
+            <if test="payee != null  and payee != ''">
+                or a.payee=#{payee}
+            </if>
+
+            <if test="salesmen != null  and salesmen != '' " >
+                or a.salesmen=#{salesmen}
+            </if>
+
+
             <if test="blSign != null  and blSign == 1">
                 and a.bl_sign='1'
             </if>