Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java

@@ -33,6 +33,7 @@ import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Description : 成都volvo发运单打印策略
@@ -196,15 +197,12 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat
             detailModel.setPartNo(detail.getPartNo());
             detailModel.setPartName(detail.getPartName());
             detailModel.setCustPartNo(detail.getCustPartNo());
-            if (!StringUtils.isEmpty(detail.getPartPosition())) {
-                String tmpPosition = detail.getPartPosition().substring(detail.getPartPosition().length() - 2);
-                StringBuilder splitPosition = new StringBuilder();
-                for (char c : tmpPosition.toCharArray()) {
-                    if (Character.isDigit(c)) {
-                        splitPosition.append(c);
+            if (detail.getSourceId() != null) {
+                for (MesCimVolvoJisRackIdDetail rackIdDetail : rackIdDetails) {
+                    if (Objects.equals(detail.getSourceId(), rackIdDetail.getId())) {
+                        detailModel.setPartPosition(rackIdDetail.getPosition());
                     }
                 }
-                detailModel.setPartPosition(splitPosition.toString());
             }
             detailModels.add(detailModel);
         }