Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into yfai-20250418-dev

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;
@@ -152,8 +151,8 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
             throw new ImppBusiException(String.format("【%s】此条码已经扫描过，请检查数据！", model.getSn()));
         }
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(model.getSn(), "productSn", packBean);
+        packBean.setWhereAppend(packBean.getWhereAppend() + " and (model.productSn = '"+ model.getSn() +"' or model.custSn = '"+ model.getSn() + "')");
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesPcnExtConstWords.CREATE_DATE_TIME}, packBean);
         MesProduceSn produceSn = produceSnRepository.getByProperty(packBean);
         if (!StringUtils.isEmpty(produceSn)) {
             if (orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.UNPACKING.getValue()) {