'出库信息列表'

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

@@ -801,7 +801,12 @@ public class OmstruckOrderController extends BaseRESTfulController {
     })
     @PostMapping("/closeOmstruckOrder")
     public RESTfulResult closeOmstruckOrder(@RequestParam Integer orderId) {
-        int result = omstruckOrderService.closeOmstruckOrder(new BigDecimal(orderId));
+        int result = 0;
+        try {
+            result = omstruckOrderService.closeOmstruckOrder(new BigDecimal(orderId));
+        } catch (Exception e) {
+            return failed(e.getMessage());
+        }
         return success(result);
     }
 

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

@@ -132,4 +132,7 @@ public interface OmstruckOrderSeparateMapper {
 
     //查询订单发货日期（订单类型为1）
     Integer getDeliveryDatePass(Object orderId);
+
+    BigDecimal getWeightTask(BigDecimal orderId);
+
 }

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

@@ -143,7 +143,7 @@ public interface IOmstruckOrderService {
     int addAppTruckOrder(Integer dispatchId, Integer orderType, String capacityNumber,Integer carrierId);
 
     // 根据运单id关闭订单
-    int closeOmstruckOrder(BigDecimal orderId);
+    int closeOmstruckOrder(BigDecimal orderId) throws Exception;
 
     // 查询所有车牌号和司机
     List<Map<String, Object>> getCapacityAndDriverList(Map<String, Object> mapValue);

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

@@ -1490,7 +1490,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      * @return
      */
     @Override
-    public int closeOmstruckOrder(BigDecimal orderId) {
+    public int closeOmstruckOrder(BigDecimal orderId) throws Exception {
+        BigDecimal i = omstruckOrderSeparateMapper.getWeightTask(orderId);
+        if(i != null){
+            throw new Exception("存在计量实绩,无法删除");
+        }
         OmstruckOrder omstruckOrder = omstruckOrderMapper.selectByPrimaryKey(orderId);
         omstruckOrder.setOrderStatus(new BigDecimal(7));
         int result = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);

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

@@ -1891,7 +1891,7 @@
     <!--销售，查看运输订单(钢材销售订单)并根据司机接受或者拒绝时间进行排序  -->
     <select id="selectTransportOrderForSale" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT * FROM (
-        SELECT *from(
+        SELECT DISTINCT *from(
         select
         OO.ORDER_NUMBER "orderNumber",
         ASO.SALE_NUMBER "saleNumber",
@@ -1938,7 +1938,7 @@
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID=OO.ORDER_ID
         LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
         <where>
             <if test="orderStatus!=null">
                 AND OO.ORDER_STATUS = #{orderStatus}
@@ -4038,6 +4038,7 @@
         ON WOR.BILL_LADING_ID = OO.ORDER_ID
         LEFT JOIN WMSP_OUTBOUND_RESULT_MATERIAL WORM
         ON WORM.OUTBOUND_RESULT_ID = WOR.RESULT_ID
+        AND WORM.MATERIAL_ID = OOM.MATERIAL_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         WHERE OO.ORDER_STATUS = 5

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

@@ -891,4 +891,12 @@
         where OO.ORDER_ID = #{orderId}
           and TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'YYYY-MM-DD hh24:mi:ss') >= TO_CHAR(SYSDATE - 1, 'YYYY-MM-DD hh24:mi:ss')
     </select>
+    <select id="getWeightTask" resultType="java.math.BigDecimal" parameterType="decimal">
+        SELECT twr.RESULT_TARE_WEIGHT FROM TMSTRUCK_WEIGHT_RESULT TWR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>