txf 3 роки тому
батько
коміт
b17b78fc70

+ 2 - 2
src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -272,8 +272,8 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
 
 
     @ApiOperation(value = "正常关闭运输订单")
     @ApiOperation(value = "正常关闭运输订单")
     @PostMapping("/closeInwardOrder")
     @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));
     }
     }
 
 
 }
 }

+ 1 - 1
src/main/java/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.java

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

+ 1 - 1
src/main/java/com/steerinfo/dil/service/IOmstruckOrderSeparateService.java

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

+ 2 - 2
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -624,8 +624,8 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     }
     }
 
 
     @Override
     @Override
-    public int closeInwardOrder(Integer orderId) {
-        int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId);
+    public int closeInwardOrder(Integer orderId, Integer sqe) {
+        int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId, sqe);
         Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
         Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
         //根据运输订单id查找需求日期是否超过一个月
         //根据运输订单id查找需求日期是否超过一个月
         if(map != null){
         if(map != null){

+ 3 - 0
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -586,6 +586,9 @@
     <update id="closeInwardOrder" parameterType="java.lang.Integer">
     <update id="closeInwardOrder" parameterType="java.lang.Integer">
         update OMSTRUCK_ORDER OO
         update OMSTRUCK_ORDER OO
         set oo.ORDER_STATUS = 2
         set oo.ORDER_STATUS = 2
+        <if test="sqe != null">
+            , OO.ORDER_LINE_SEQUENCE = #{sqe}
+        </if>
         where oo.ORDER_ID = #{orderId}
         where oo.ORDER_ID = #{orderId}
     </update>
     </update>
     <!--  通过装卸工SSOID查询装过的订单信息  -->
     <!--  通过装卸工SSOID查询装过的订单信息  -->