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

pom.xml

@@ -109,7 +109,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <table>AMSTRUCK_SPORADIC_ORDER</table>
+                        <table>TMSTRUCK_UNLOAD_RESULT</table>
 <!--                        <param>TMSTRAIN_WEIGHT_RESULT</param>-->
                     </tables>
                 </configuration>

src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -267,4 +267,10 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         int i = omstruckOrderSeparateService.deleteOrders(map);
         return success(i);
     }
+
+    @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")
+    @PostMapping("/getAllLoadUnloadResult")
+    public RESTfulResult getAllLoadUnloadResult(@RequestBody (required = false) Map<String, Object> map){
+        return success(omstruckOrderSeparateService.getAllLoadUnloadResult(map));
+    }
 }

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

@@ -103,4 +103,6 @@ public interface OmstruckOrderSeparateMapper {
     int updateAPOisMoreTrips(BigDecimal purchaseOrderId);
 //    int updateTimes(@Param("orderPlanId") BigDecimal orderPlanId, @Param("times")int times);
 
+    //通过装卸工SSOID查询装过的订单信息
+    List<Map<String, Object>> getAllLoaderLoadingOrder(Map<String, Object> map);
 }

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

@@ -14,8 +14,10 @@ import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -537,4 +539,18 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         omstruckOrderMaterialMapper.batchByOrderIdForTotalDelete(orderIdList);
         return orderIdList.size();
     }
+
+    /**
+     * 装卸工查询自己所有装了货的订单信息
+     * @Author TXF
+     * @Date 2022/1/15 17:07
+     * @param map
+     * @return
+     **/
+    public List<Map<String, Object>> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> map){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        map.put("limitTime", sdf.format(new Date(new Date().getTime() - 43200000)));
+        List<Map<String, Object>> allLoaderLoadingOrder = omstruckOrderSeparateMapper.getAllLoaderLoadingOrder(map);
+        return allLoaderLoadingOrder;
+    }
 }

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

@@ -1556,7 +1556,7 @@
         <if test="remark != null">
             and db.RESULT_FOREIGN_SHIP_NAME like #{remark}
         </if>
-        order by apo.PURCHASE_ORDER_DATE desc
+        order by apo.PURCHASE_ORDER_NO desc
         )
         where rownum = 1
     </select>
@@ -2773,9 +2773,12 @@
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
-        <if test="status != null">
+        <if test="status == 2">
             AND OO.ORDER_STATUS = 2
         </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
     </select>
 
 <!--查询采购零星物资信息给app 12 -->
@@ -2801,9 +2804,12 @@
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
-        <if test="status != null">
+        <if test="status == 2">
             AND OO.ORDER_STATUS = 2
         </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
     </select>
 
     <!--  查询内转运输订单给APP 9 10 11-->
@@ -2834,9 +2840,12 @@
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
-        <if test="status != null">
+        <if test="status == 2">
             AND OO.ORDER_STATUS = 2
         </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
         <if test="orderStatus == 4">
             AND AIP.PLAN_EABLE_STATUS = 1
         </if>
@@ -2896,12 +2905,15 @@
                  LEFT JOIN RMS_RECEIVE_ADDRESS RDA
                            ON RDA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         WHERE OO.ORDER_ID = #{orderId}
-          <if test="status == null">
-              AND OO.ORDER_STATUS in (4, 5, 6)
-          </if>
-          <if test="status != null">
-              AND OO.ORDER_STATUS = 2
-          </if>
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
     </select>
 
 

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

@@ -575,10 +575,52 @@
         WHERE OO.ORDER_ID = #{orderId}
     </select>
 
-<!--  修改采购订单是否为一车多趟  -->
+
+    <!--  修改采购订单是否为一车多趟  -->
     <update id="updateAPOisMoreTrips" parameterType="java.math.BigDecimal">
         update AMS_PURCHASE_ORDER APO
         set APO.IS_MORE_TRIPS = 1
         where APO.PURCHASE_ORDER_ID = #{purchaseOrderId}
     </update>
+
+
+<!--  通过装卸工SSOID查询装过的订单信息  -->
+    <select id="getAllLoaderLoadingOrder" parameterType="map" resultType="java.util.Map">
+        select OO.ORDER_ID  "orderId",
+               OO.ORDER_NUMBER "orderNumber",
+               RC.CAPACITY_NUMBER   "capacityNumber"
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR
+            on TTR.ORDER_ID = OO.ORDER_ID
+        left join RMS_CAPACITY RC
+            on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="loaderSsoId != null">
+            left join TMSTRUCK_LOAD_RESULT TLR
+            on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+            left join RMS_PERSONNEL RP
+            on RP.PERSONNEL_ID = TLR.LOADER_ID
+        </if>
+        <if test="unLoaderSsoId != null">
+            left join TMSTRUCK_UNLOAD_RESULT TUR
+            on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+            left join RMS_PERSONNEL RP
+            on RP.PERSONNEL_ID = TUR.UNLOADER_ID
+        </if>
+
+        <where>
+            <if test="loaderSsoId != null">
+                RP.PERSONNEL_SSO_ID = #{loaderSsoId}
+                and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
+                order by TLR.RESULT_LOAD_END_TIME desc
+            </if>
+            <if test="unLoaderSsoId != null">
+                RP.PERSONNEL_SSO_ID = #{unLoaderSsoId}
+                and TUR.RESULT_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
+                order by TUR.RESULT_END_TIME desc
+            </if>
+            <if test="loaderSsoId == null and unLoaderSsoId == null">
+                rownum &lt; 100
+            </if>
+        </where>
+    </select>
 </mapper>