1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoTitleDetailsServiceImpl.java

@@ -115,7 +115,7 @@ public class CargoTitleDetailsServiceImpl extends ServiceImpl<CargoTitleDetailsM
                 if (weight >= warehousingOrder.getSurplusWeight()) {
                     weight = weight - warehousingOrder.getSurplusWeight();
                     //转出重量
-                    warehousingOrder.setTransferOutWeight(warehousingOrder.getSurplusWeight());
+                    warehousingOrder.setTransferOutWeight(warehousingOrder.getTransferOutWeight()+warehousingOrder.getSurplusWeight());
                     warehousingOrder.setSurplusWeight(0d);
                     warehousingOrder.setTransferOutNo(transferOutNo);
                     if ("1".equals(cargoTitleDetails.getRedeemFlag())) {
@@ -125,7 +125,7 @@ public class CargoTitleDetailsServiceImpl extends ServiceImpl<CargoTitleDetailsM
                 } else if (weight > 0) {
                     Double weightTmp = weight - warehousingOrder.getSurplusWeight();
                     //部分转出
-                    warehousingOrder.setTransferOutWeight(weight);
+                    warehousingOrder.setTransferOutWeight(warehousingOrder.getTransferOutWeight()+weight);
                     warehousingOrder.setSurplusWeight(warehousingOrder.getSurplusWeight()-weight);
                     warehousingOrder.setTransferOutNo(transferOutNo);
                     if ("1".equals(cargoTitleDetails.getRedeemFlag())) {
@@ -233,6 +233,7 @@ public class CargoTitleDetailsServiceImpl extends ServiceImpl<CargoTitleDetailsM
         pageView.put("startDate",cargoTitleDetails.getStartDate());
         pageView.put("endDate",cargoTitleDetails.getEndDate());
         pageView.put("searchKeyWord",cargoTitleDetails.getSearchKeyWord());
+        pageView.put("agent",cargoTitleDetails.getAgent());
         pageView.put("searchType", cargoTitleDetails.getSearchType());
         pageView.put("pageSize",cargoTitleDetails.getPageSize());
         pageView.put("currentPage",cargoTitleDetails.getCurrentPage());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/CargoTitleDetailsMapper.xml

@@ -17,6 +17,9 @@
                 AND transfer_flag='2'
             </if>
         </if>
+        <if test="agent != null and agent != ''">
+            AND agent = #{agent}
+        </if>
         <if test="startDate != null">
             AND (DATE_FORMAT(create_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))
@@ -63,6 +66,9 @@
                 AND transfer_flag='2'
             </if>
         </if>
+        <if test="agent != null and agent != ''">
+            AND agent = #{agent}
+        </if>
         <if test="startDate != null">
             AND (DATE_FORMAT(create_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/FuelFillingInfoMapper.xml

@@ -16,11 +16,11 @@
         <if test="searchType != null and searchType != ''">
             <!--未完成-->
             <if test="searchType == 1">
-                AND ff.travel_status_flag = '1'
+                AND ff.status != '已通过'
             </if>
             <!--已完成-->
             <if test="searchType == 3">
-                AND (ff.travel_status_flag = '3' OR ff.travel_status_flag = '5')
+                AND ff.status = '已通过'
             </if>
         </if>
         GROUP BY ff.id
@@ -71,11 +71,11 @@
         <if test="searchType != null and searchType != ''">
             <!--未完成-->
             <if test="searchType == 1">
-                AND ff.travel_status_flag = '1'
+                AND ff.status != '已通过'
             </if>
             <!--已完成-->
             <if test="searchType == 3">
-                AND (ff.travel_status_flag = '3' OR ff.travel_status_flag = '5')
+                AND ff.status = '已通过'
             </if>
         </if>
         GROUP BY ff.id