处理BUg

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

 package com.clx.performance.dao.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -288,7 +289,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public List<OrderChild> selectResidueWeightByOrderGoodsNo(String orderGoodsNo, Integer status, List<String> truckList) {
         return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderGoodsNo,orderGoodsNo)
                 .lt(ObjectUtil.isNotEmpty(status),OrderChild::getStatus, status)
-                .in(OrderChild::getTruckNo, truckList)
+                .in(CollectionUtil.isNotEmpty(truckList),OrderChild::getTruckNo, truckList)
         );
     }
 

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -209,7 +209,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             case 7:
                 //挂单中 ，算违约，需要判断弹窗2还是3
                 //约可取消吨数
-                return "selectType";
+                return "writeRemark";
             case 8: //运输中 ，算违约， 弹窗3
                 return "selectType";
             case 9:  //已完成，不能取消