Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131_youshen430

# Conflicts:
#	sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderWeighbridgeRepository.java

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -110,7 +110,7 @@ public class KwsMenuService {
             if (!Objects.isNull(params.getSort())) {
                 moveSort(params);
             }
-            params.setUsingRoles(parent.getUsingRoles());
+          //  params.setUsingRoles(parent.getUsingRoles());
         }
 
         //新增菜单时，如果已经有同级菜单，则序号为最大的序号+1

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ComeIntoHandler.java

@@ -77,7 +77,8 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
      * @return
      */
     private Boolean checkIsFirst(KwtWaybillOrder waybillOrder) {
-        List<KwtWaybillOrderWeighbridge> weighbridges = waybillOrderWeighbridgeRepository.queryWaybillOrderWeighbridgeByWOrderId(waybillOrder.getId());
+        List<KwtWaybillOrderWeighbridge> weighbridges = waybillOrderWeighbridgeRepository
+                .queryWaybillOrderWeighbridgeByWOrderId(waybillOrder.getId(), WeighbridgeTypeEnum.LOADING.getCode());
         return CollectionUtils.isEmpty(weighbridges);
     }
 
@@ -363,7 +364,8 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
      */
     @Override
     protected void createNodeTrace(WaybillOrderCmeIntoWeighParam param, KwtWaybillOrder waybillOrder) {
-        List<KwtWaybillOrderWeighbridge> weighbridges = waybillOrderWeighbridgeRepository.queryWaybillOrderWeighbridgeByWOrderId(waybillOrder.getId());
+        List<KwtWaybillOrderWeighbridge> weighbridges = waybillOrderWeighbridgeRepository
+                .queryWaybillOrderWeighbridgeByWOrderId(waybillOrder.getId(), WeighbridgeTypeEnum.LOADING.getCode());
         if (CollectionUtils.isEmpty(weighbridges)) {
             // 第一条：称重完成
             KwtWaybillOrderNode node1 = getWaybillOrderNode(param, waybillOrder);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderWeighbridgeRepository.java

@@ -18,11 +18,11 @@ import java.util.List;
 @Repository
 public class KwtWaybillOrderWeighbridgeRepository extends ServiceImpl<KwtWaybillOrderWeighbridgeMapper, KwtWaybillOrderWeighbridge> {
 
-    public List<KwtWaybillOrderWeighbridge> queryWaybillOrderWeighbridgeByWOrderId(Long wOrderId) {
+    public List<KwtWaybillOrderWeighbridge> queryWaybillOrderWeighbridgeByWOrderId(Long wOrderId, Integer type) {
         return list(
                 Wrappers.<KwtWaybillOrderWeighbridge>lambdaQuery()
                         .eq(KwtWaybillOrderWeighbridge::getWOrderId, wOrderId)
-                        .eq(KwtWaybillOrderWeighbridge::getType, 1)
+                        .eq(KwtWaybillOrderWeighbridge::getType, type)
                         .orderByDesc(KwtWaybillOrderWeighbridge::getId));
     }