已退回数量，装车吨位必填

ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderBillsPlansMapper.java

@@ -210,4 +210,6 @@ public interface OrderBillsPlansMapper {
      * @param audit2Desc
      */
     void addAReviewComment(@Param("entityId") Long entityId, @Param("audit2Desc") String audit2Desc, @Param("lineNo") Long lineNo);
+
+    Integer getsTheQuantityOfTheReturnedOrder(Map<String, Object> map);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderBillsPlansService.java

@@ -8,6 +8,7 @@ import com.ruoyi.system.domain.vo.TmsAttachMngsVo;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 public interface IOrderBillsPlansService {
 
@@ -20,7 +21,7 @@ public interface IOrderBillsPlansService {
      * @param pageSize
      * @return
      */
-    List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, OrderBillsPlansVo orderBillsPlansVo);
+    Map<String, Object> getOrderBillsPlansList(String dataStart, String dataEnd, OrderBillsPlansVo orderBillsPlansVo);
 
     /**
      * 根据orderNo查询

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderBillsPlansServiceImpl.java

@@ -59,7 +59,7 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
      * @return
      */
     @Override
-    public List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, OrderBillsPlansVo orderBillsPlansVo) {
+    public Map<String, Object> getOrderBillsPlansList(String dataStart, String dataEnd, OrderBillsPlansVo orderBillsPlansVo) {
 
 
         String orderNo = orderBillsPlansVo.getOrderNo();
@@ -141,7 +141,15 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
                 }
             }
         }
-        return orderBillsPlansList;
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("orderBillsPlansList", orderBillsPlansList);
+        Integer i = orderBillsPlansMapper.getsTheQuantityOfTheReturnedOrder(map);
+        if (i != 0) {
+            data.put("numberOfReturns", i);
+        }
+
+        return data;
     }
 
     /**

ruoyi-system/src/main/resources/mapper/system/OrderBillsPlansMapper.xml

@@ -230,6 +230,46 @@
 
     </select>
 
+
+    <select id="getsTheQuantityOfTheReturnedOrder" resultType="java.lang.Integer">
+        Select
+        COUNT(1)
+        from wf_TaskList t
+        Left join LoadBills b on (b.SysID=t.SysID and b.EntityID=t.EntityID)
+        Left join OrderBillsPlans p on (p.SysID=b.SysID and p.EntityID=b.SrcEntityID and p.LineNo=b.SrcLineNo)
+        Left join Empls e on (e.SysID=b.SysID and e.EmplID=b.TransactID)
+        Left join Empls dr1 on (dr1.SysID=b.SysID and dr1.EmplID=p.DRIVER1ID)
+        Left join Empls sp on (sp.SysID=b.SysID and sp.EmplID=p.SUPERCARGOID)
+        Left join Corps c on (c.SysID=p.SysID and c.CorpID=p.CorpID)
+        Left join Corps l on (l.SysID=p.SysID and l.CorpID=p.LoadFactoryID)
+        Left join Corps ul on (ul.SysID=b.SysID and ul.CorpID=p.UnLoadFactoryID)
+        Left join Goods g on (g.SysID=b.SysID and g.GoodsID=b.GoodsID)
+
+
+        <where>
+            t.SysID=1
+                and t.ActID = #{actId, jdbcType=VARCHAR}
+                    and p.ifStarted = 'B'
+            and ((b.CarID=-1) or ((b.CarID &lt;&gt; -1)))  and p.IfOrder1ed = 'T'
+            <if test="dataStart != null and dataStart != '' and dataEnd != null and dataEnd != ''">
+                and b.BillDate >= #{dataStart, jdbcType=VARCHAR} and b.BillDate &lt;= #{dataEnd, jdbcType=VARCHAR}
+            </if>
+            <if test="role == 0">
+                and p.DeptUserID = #{emplId, jdbcType=VARCHAR}
+            </if>
+            <if test="role == 1">
+                and ((p.DRIVER1ID=#{emplId, jdbcType=VARCHAR}) or (p.SUPERCARGOID=#{emplId, jdbcType=VARCHAR}))
+            </if>
+
+            <if test="orderNo != null and orderNo != ''">
+                and (p.CarRegNo like #{orderNo}
+                or p.loadAddr like #{orderNo}
+                or p.unLoadAddr like #{orderNo}
+                or g.CName like #{orderNo})
+            </if>
+        </where>
+    </select>
+
     <select id="getOrderBillsPlansByid" resultType="com.ruoyi.system.domain.OrderBillsPlans">
         Select g.CName           goodsCName
              , p.LoadAddr        loadAddr