Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd

3 months ago · 373c32d7c0
parent b5bf8a3d3f bc9ddc502b
commit 373c32d7c0
2 changed files with 3 additions and 1 deletions
--- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesSortShippingCheckService.java
+++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesSortShippingCheckService.java
@ -44,4 +44,7 @@ public interface IMesSortShippingCheckService {

    void saveSecondShipScanOrder(MesSortShippingCheckModel model);

+    @ApiOperation(value = "待发运列表")
+    MesSortShippingCheckModel getSortShippingQueueList(MesSortShippingCheckModel model);
+
 }
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java
@ -32,7 +32,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;

-import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;