物流改写

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationMapper.xml

@@ -90,12 +90,12 @@
         from LM_STATION l
         left join LM_STATION_CENTER r
         on l.id = r.STATION_ID
+
+        where l.IS_DELETED = 0
         <!-- wcId 条件放到 on 中，不破坏左连接 -->
         <if test="wcId != null">
             and r.WC_ID = #{wcId}
         </if>
-        where l.IS_DELETED = 0
-
         <!-- 去掉 stationStatus 的空字符串判断 -->
         <if test="stationStatus != null">
             <if test="stationStatusInclude">
@@ -116,4 +116,5 @@
             </if>
         </if>
     </select>
+
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java

@@ -535,7 +535,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
 
 
         } else {
-            List<StationVO> statusStationList = stationService.getStatusStationList(null, false, wcID, STATION_RECEIVE_ONLY, false);
+            List<StationVO> statusStationList = stationService.getStatusStationList(null, false, (Long) map.get("wcId"), STATION_RECEIVE_ONLY, false);
             map.put("stationRegion", statusStationList.get(0).getStationRegion());
         }
         log.info("获取当前方法返回值:"+map);
@@ -1435,7 +1435,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
         if (prWorkOrderList != null && !prWorkOrderList.isEmpty()) {
             PrWorkOrder prWorkOrder = prWorkOrderList.get(0);
             List<PrWorkPlan> workPlanList = prWorkPlanService.lambdaQuery()
-                    .select(PrWorkPlan::getStatus, PrWorkPlan::getNextWpId, PrWorkPlan::getWpId, PrWorkPlan::getMakeTeam)
+                    .select(PrWorkPlan::getStatus, PrWorkPlan::getNextWpId, PrWorkPlan::getWpId, PrWorkPlan::getMakeTeam,PrWorkPlan::getSubsidiaryTeam)
                     .eq(PrWorkPlan::getWpId, prWorkOrder.getWpId())
                     .list();
 
@@ -1452,7 +1452,8 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
                 } else {
                     List<CenterTeam> list = iCenterTeamService.list(new LambdaQueryWrapper<CenterTeam>()
                             .select(CenterTeam::getWcId, CenterTeam::getTsId)
-                            .eq(CenterTeam::getTsId, (workPlan.getMakeTeam())));
+                            .eq(workPlan.getSubsidiaryTeam()!=null&&!workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam()))
+                            .eq(workPlan==null||workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam())));
                     if (list == null || list.size() == 0) {
                         return R.fail(orderCardNo + "车间订单班次查询作业中心异常");
                     } else {