修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-oms-api</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -1048,6 +1048,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
     @PostMapping("/CloseOrder")
     public  RESTfulResult CloseOrder(@RequestBody(required = false)Map<String,Object> map){
       int result=omstruckOrderService.closeOrder(map);
+      if(result == 0) {
+          return failed(result);
+      }
       return success(result);
     }
 

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

@@ -1682,6 +1682,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Integer orderId =(Integer) map.get("orderId");
         OmstruckOrder omstruckOrder=new OmstruckOrder();
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
+        BigDecimal i = omstruckOrderSeparateMapper.getWeightTask(DataChange.dataToBigDecimal(orderId));
+        if(i != null) {
+            return 0;
+        }
         omstruckOrder.setOrderStatus(new BigDecimal(8));
         omstruckOrder.setInsertUpdateRemark("作废运单(8),oos1559行");
         omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);

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

@@ -1910,7 +1910,9 @@
         RM.MATERIAL_MODEL "materialModel",
         OO.DRIVER_TEL "drivelTel",
         ASM.SALE_WAREHOUSE "saleWarehouse",
-        ASM.MATERIAL_NUMBER "materialNumber"
+        ASM.MATERIAL_NUMBER "materialNumber",
+        TTR.ORDER_STATUS    "transOrderStatus",
+        decode(TTR.ORDER_STATUS,'已进厂',100,'已接单',99,'已派单',98,97) "transOrderStatusSqe"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -1940,11 +1942,16 @@
         ON OOM.ORDER_ID=OO.ORDER_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
         <where>
             ASM.SALE_MATERIAL_ID IS NOT NULL
             <if test="orderStatus!=null">
                 AND OO.ORDER_STATUS = #{orderStatus}
             </if>
+            <if test="orderStatus == null">
+                AND OO.ORDER_STATUS in (4,5)
+            </if>
             <if test="carrierSsoId!=null">
                 and RC3.CARRIER_SSO_ID = #{carrierSsoId}
             </if>
@@ -1995,11 +2002,14 @@
                     "consigneeCompanyName" like '%${item}%'
                 </foreach>
             </if>
+            <if test="transOrderStatus != null and transOrderStatus != ''">
+                and "transOrderStatus"  like Concat('%',Concat(#{transOrderStatus},'%'))
+            </if>
         </where>
         <include refid="orderBy">
         </include>
         <if test="orderField == null  ">
-            order by "orderNumber" desc
+            order by "transOrderStatusSqe" desc, "orderNumber" desc
         </if>
     </select>