钢材修改

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

@@ -278,8 +278,8 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
 
     @ApiOperation(value = "正常关闭运输订单")
     @PostMapping("/closeInwardOrder")
-    public RESTfulResult closeInwardOrder(Integer orderId, Integer sqe){
-        return success(omstruckOrderSeparateService.closeInwardOrder(orderId, sqe));
+    public RESTfulResult closeInwardOrder(Integer orderId, Integer sqe, String resultNetWeight){
+        return success(omstruckOrderSeparateService.closeInwardOrder(orderId, sqe, resultNetWeight));
     }
 
 

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

@@ -328,4 +328,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     int deleteTimeTaskByTotalId(BigDecimal resultTotalId);
 
     int closeTruckOrder(BigDecimal orderId);
+
+    Map<String, Object> getSteelOrderMessageToApp(Map<String, Object> map);
 }

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -123,4 +124,7 @@ public interface OmstruckOrderSeparateMapper {
 
     Integer getSporadicStatus(Object orderId);
 
+    List<Map<String, Object>> getThreeDateMes(BigDecimal resultTotalId);
+
+    int cancelLoadMaterialBySteel(BigDecimal orderId);
 }

src/main/java/com/steerinfo/dil/service/IOmstruckOrderSeparateService.java

@@ -40,7 +40,7 @@ public interface IOmstruckOrderSeparateService {
     int batchCloseOrder(List<Map<String, Object>> mapList);
     List<Map<String,Object>> getOrderMaterial(Integer orderId);
 
-    int closeInwardOrder(Integer orderId, Integer sqe);
+    int closeInwardOrder(Integer orderId, Integer sqe, String resultNetWeight);
 
 
     List<Map<String,Object>> getTimeTaskEnd(Map<String, Object> map);

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

@@ -248,6 +248,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     public List<Map<String,Object>> getNormalOrderResult(BigDecimal resultTotalId) {
         List<Map<String,Object>> dataList = new ArrayList<>(20);
         dataList.addAll(omstruckOrderSeparateMapper.getTwoDateMes(resultTotalId));
+        dataList.addAll(omstruckOrderSeparateMapper.getThreeDateMes(resultTotalId));
         dataList.addAll(omstruckOrderSeparateMapper.getFourDateMes(resultTotalId));
         //对列表中数据路段顺序号进行排序
         dataList.sort(new Comparator<Map<String, Object>>() {
@@ -649,7 +650,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     }
 
     @Override
-    public int closeInwardOrder(Integer orderId, Integer sqe) {
+    public int closeInwardOrder(Integer orderId, Integer sqe, String resultNetWeight) {
         int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId, sqe);
         Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
         //根据运输订单id查找需求日期是否超过一个月
@@ -696,5 +697,13 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         return omstruckOrderMapper.getPauseTimeTaskDetail(orderId);
     }
 
-
+    /**
+     * Notes：取消装剩余物资
+     * @Author: TXF
+     * @DateTime: 2022/3/24 18:53
+     */
+    public int cancelLoadMaterialBySteel(BigDecimal orderId){
+        //将路段顺序号置为路线最大路段顺序号-1：直接到出厂阶段
+        return omstruckOrderSeparateMapper.cancelLoadMaterialBySteel(orderId);
+    }
 }

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

@@ -1913,6 +1913,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Map<String, Object> mesMap = new HashMap<>();
         switch (orderType){
             case 1:
+                mesMap = omstruckOrderMapper.getSteelOrderMessageToApp(map);
+                break;
             case 2:
                 mesMap = omstruckOrderMapper.getXSOrderMessageToApp(map);
                 break;

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

@@ -2898,33 +2898,30 @@
     </select>
     <!--  查询销售运输订单给APP 1 -->
     <select id="getXSOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT OO.ORDER_ID                          "orderId",
-               OO.ORDER_TYPE                        "orderType",
-               OO.ORDER_LINE_SEQUENCE               "orderLineSequence",
-               OO.ORDER_NUMBER                      "orderNumber",
-               RC.CAPACITY_NUMBER                   "capacityNumber",
-               RS.SHIPPER_NAME                      "shipperName",
-               ASOM.SALE_DATE_OF_RECEIPT            "saleDateOfReceipt",
-               RC2.CONSIGNEE_COMPANY_NAME           "consigneeCompanyName",
-               CONCAT(CONCAT(CONCAT(RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT), RDA.ADDRESS_TOWN),
-               RDA.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
-               ASM.SALE_WAREHOUSE                   "remark"
-        FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-                           on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
-                 LEFT JOIN AMS_SALE_ORDER ASO
-                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-                 LEFT JOIN AMS_SALE_MATERIAL ASM
-                           ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
-                 LEFT JOIN RMS_SHIPPER RS
-                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
-                 LEFT JOIN RMS_CONSIGNEE RC2
-                           ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
-                 LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                 LEFT JOIN RMS_RECEIVE_ADDRESS RDA
-                           ON RDA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
-        WHERE OO.ORDER_ID = #{orderId}
+        SELECT
+        OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),
+        RDA.ADDRESS_DELIVERY_ADDRESS ) "receiveAddressName",
+        ASM.SALE_WAREHOUSE "remark"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
@@ -3447,4 +3444,38 @@
         ON TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
       WHERE TTR.RESULT_TOTAL_ID=#{resultTotalId} and TTTR.RESULT_TIME_TYPE=1
     </select>
+
+    <select id="getSteelOrderMessageToApp" parameterType="map" resultType="map">
+        SELECT
+        OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ) "receiveAddressName"
+
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        <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>
 </mapper>

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

@@ -767,15 +767,6 @@
                            on RG.GATEPOST_ID = TER.GATEPOST_ID
         where TER.RESULT_TOTAL_ID = #{resultTotalId}
         UNION
-        select TUR.RESULT_END_TIME    "pointDate",
-               RW.WAREHOUSE_NAME    "pointName",
-               TUR.SEGMENT_SQE             "segmentSqe",
-               '卸货'                          "linkName"
-        from TMSTRUCK_UNLOAD_RESULT TUR
-                 left join RMS_WAREHOUSE RW
-                           on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-        where  TUR.RESULT_TOTAL_ID = #{resultTotalId}
-        UNION
         select TLFR.RESULT_OUT_GATE_TIME    "pointDate",
                RG.GATEPOST_NAME     "pointName",
                TLFR.SEGMENT_SQE      "segmenSqe",
@@ -784,17 +775,6 @@
                  left join RMS_GATEPOST RG
                            on RG.GATEPOST_ID = TLFR.GATEPOST_ID
         where TLFR.RESULT_TOTAL_ID = #{resultTotalId}
-        UNION
-        select TLR.RESULT_LOAD_END_TIME "pointDate",
-               RW.WAREHOUSE_NAME "pointName",
-               TLR.SEGMENT_SQE     "segmenSqe",
-               '装货'                          "linkName"
-        from TMSTRUCK_LOAD_RESULT TLR
-                 left join TMSTRUCK_TOTAL_RESULT TTR
-                           on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
-                 left join RMS_WAREHOUSE RW
-                           on RW.WAREHOUSE_ID = TLR.LOADING_ID
-        where TLR.RESULT_TOTAL_ID = #{resultTotalId}
     </select>
 
     <select id="getFourDateMes" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -825,4 +805,37 @@
         where TWR.RESULT_TOTAL_ID = #{resultTotalId}
     </select>
 
+
+    <select id="getThreeDateMes" parameterType="java.math.BigDecimal" resultType="map">
+        select TUR.RESULT_END_TIME    "pointDate",
+               RW.WAREHOUSE_NAME    "pointName",
+               RM.MATERIAL_NAME ||  RM.MATERIAL_SPECIFICATION  || RM.MATERIAL_MODEL  "materialName",
+               TUR.SEGMENT_SQE             "segmenSqe",
+               '卸货'                          "linkName"
+        from TMSTRUCK_UNLOAD_RESULT TUR
+                 left join RMS_WAREHOUSE RW
+                           on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+                 left join RMS_MATERIAL RM
+                           on TUR.MATERIAL_ID = RM.MATERIAL_ID
+        where  TUR.RESULT_TOTAL_ID = #{resultTotalId}
+        UNION
+        select TLR.RESULT_LOAD_END_TIME "pointDate",
+               RW.WAREHOUSE_NAME "pointName",
+               RM.MATERIAL_NAME ||  RM.MATERIAL_SPECIFICATION  || RM.MATERIAL_MODEL  "materialName",
+               TLR.SEGMENT_SQE     "segmenSqe",
+               '装货'                          "linkName"
+        from TMSTRUCK_LOAD_RESULT TLR
+                 left join RMS_WAREHOUSE RW
+                           on RW.WAREHOUSE_ID = TLR.LOADING_ID
+                 left join RMS_MATERIAL RM
+                           on TLR.MATERIAL_ID = RM.MATERIAL_ID
+        where TLR.RESULT_TOTAL_ID = #{resultTotalId}
+    </select>
+
+    <update id="cancelLoadMaterialBySteel" parameterType="java.math.BigDecimal">
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_LINE_SEQUENCE =
+                (select MAX(RLS.SEGMENT_SQE) - 1 from RMS_LINE_SEGEMNT RLS where OO.LINE_ID = RLS.LINE_ID)
+        where OO.ORDER_ID = #{orderId}
+    </update>
 </mapper>