Merge branch 'dev_temp_xw_202503260000_45858' into uat-temp-wj-chongqingdaqu-dev

uat-temp-wj-chongqingdaqu-dev
xiangwei.zhang 4 months ago
commit 638ac2b921

@ -301,7 +301,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
MesPartInspection mesPartInspection = null;
if (!StringUtils.isEmpty(mesReworkTask.getId())){
DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesReworkTask.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(mesReworkTask.getId(), "reworkTaskId", packBean);
DdlPreparedPack.getNumEqualPack(mesReworkTask.getPartInspectionId(), "id", packBean);
mesPartInspection = mesPartInspectionRepository.getByProperty(packBean);
if (!Objects.isNull(mesPartInspection)){
if(!CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){

Loading…
Cancel
Save