as

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

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

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

@@ -128,6 +128,6 @@ public interface OmstruckOrderSeparateMapper {
      //通过总实绩ID查询计毛实绩数据
     List<Map<String, Object>> getAllPiWeightResultMesByTotalId(Integer resultTotalId);
 
-    int closeInwardOrder(Integer orderId);
+    int closeInwardOrder(@Param("orderId") Integer orderId, @Param("sqe") Integer sqe);
 
 }

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

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

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

@@ -624,16 +624,14 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     }
 
     @Override
-    public int closeInwardOrder(Integer orderId) {
-      int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId);
-        //判断是否需要重新推单
-        //根据运输订单id查找需求日期是否超过一个月
+    public int closeInwardOrder(Integer orderId, Integer sqe) {
+        int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId, sqe);
         Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
-        Object dueTime = map.get("dueTime");
-        if(dueTime != null){
-            Date dueDate = (Date) dueTime;
+        //根据运输订单id查找需求日期是否超过一个月
+        if(map != null){
+            Date dueDate = (Date) map.get("dueTime");
             //当前时间小于截至日期
-            long DueTime = dueDate.getTime();
+            long DueTime = dueDate.getTime() + 86400000;
             //获取当前时间
             Date date = new Date();
             long nowTime = date.getTime();
@@ -642,7 +640,6 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
                 i += addNewTransportOrder(new BigDecimal(orderId));
             }
         }
-
-      return i;
+        return i;
     }
 }

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

@@ -8,6 +8,7 @@ import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.util.DataChange;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -805,13 +806,18 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             if(orderStatus == 5 || orderStatus == 6) {
                 throw new RuntimeException("订单已被接收或已被拒绝!");
             }
-            BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
-            //添加各个实绩
-            if(orderType.intValue() != 11){
+            int orderType = DataChange.dataToBigDecimal(orderMessage.get("orderType")).intValue();
+            if(orderType == 11){
+                //发送计量委托
+                orderMessage.put("asd", 1);
+                orderMessage.put("orderId", orderId);
+                tmsTruckFeign.sendMeasureCommission(orderMessage);
+            }else {
+                //添加各个实绩
                 omstruckOrderSeparateService.addAllSonResult(orderMessage);
             }
             //判断订单是否是一车多单
-            if (orderType.intValue()==15 || orderType.intValue()==16 || orderType.intValue()==19) {
+            if (orderType ==15 || orderType ==16 || orderType ==19) {
                 //通过订单查询趟次
                 Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
                 BigDecimal orderTimes = DataChange.dataToBigDecimal(sporadicOrderTimes.get("orderTimes"));

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

@@ -2577,9 +2577,9 @@
                CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
                (case
                     when OOM.ORDER_MATERIAL_WEIGHT is not null
-                        then OOM.ORDER_MATERIAL_WEIGHT
+                        then OOM.ORDER_MATERIAL_WEIGHT  || '吨'
                     when OOM.ORDER_MATERIAL_NUMBER is not null
-                        then OOM.ORDER_MATERIAL_NUMBER
+                        then OOM.ORDER_MATERIAL_NUMBER || '件'
                    end
                    )
                    AS                                                                   "weightNum",

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

@@ -586,6 +586,9 @@
     <update id="closeInwardOrder" parameterType="java.lang.Integer">
         update OMSTRUCK_ORDER OO
         set oo.ORDER_STATUS = 2
+        <if test="sqe != null">
+            , OO.ORDER_LINE_SEQUENCE = #{sqe}
+        </if>
         where oo.ORDER_ID = #{orderId}
     </update>
     <!--  通过装卸工SSOID查询装过的订单信息  -->
@@ -673,6 +676,7 @@
                         TLR.RESULT_LOAD_END_TIME "pointDate",
                         RW.WAREHOUSE_NAME   "pointName",
                         RM.MATERIAL_NAME    "materialName",
+                        TLR.INSERT_UPDATE_REMARK    "remark",
                         '装货'                "linkName"
                  from TMSTRUCK_LOAD_RESULT TLR
                     left join RMS_WAREHOUSE RW on TLR.LOADING_ID = RW.WAREHOUSE_ID
@@ -689,6 +693,7 @@
                         TUR.RESULT_END_TIME "pointDate",
                         RW.WAREHOUSE_NAME   "pointName",
                         RM.MATERIAL_NAME    "materialName",
+                        TUR.INSERT_UPDATE_REMARK    "remark",
                         '卸货'            "linkName"
                  from TMSTRUCK_UNLOAD_RESULT TUR
                           left join RMS_WAREHOUSE RW on TUR.RESULT_UNLOAD_PLACE_ID = RW.WAREHOUSE_ID