Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-47592' into mes-dev

mes-dev
jason 1 month ago
commit f4aedad179

@ -87,7 +87,6 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
@Override
public ListPager<MesPackageDetail> queryMesPackageDetailByPager(MesPackage mesPackage, Pager pager) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesPackage.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesPackage.getPackageNo(), MesPcnExtConstWords.PACKAGE_NO, packBean);
if (pager == null || Objects.equals(pager.getPageSize(), 0)) {
@ -707,7 +706,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
packages.setPackageSn(packingDefine.getPackCode());
packages.setPackageOneCode(packageOneCode);
packages.setOrganizeCode(mesPackageDetail.getOrganizeCode());
ConvertBean.serviceModelInitialize(packages, mesPackageDetail.getCreateUser());
ConvertBean.serviceModelInitialize(packages, mesPackageDetail.getModifyUser());
return packages;
}

Loading…
Cancel
Save