Commit 3d79e866 authored by wanghao's avatar wanghao

1 MES上传调整

parent 509ce144
...@@ -158,7 +158,7 @@ public class PalletDeviceUploadHistoryServiceImpl implements IPalletDeviceUpload ...@@ -158,7 +158,7 @@ public class PalletDeviceUploadHistoryServiceImpl implements IPalletDeviceUpload
for (PalletDeviceUploadHistory palletDeviceBinding : palletDeviceUploadHistoryList) { for (PalletDeviceUploadHistory palletDeviceBinding : palletDeviceUploadHistoryList) {
MesDeviceDomain mesDeviceDomain = new MesDeviceDomain(); MesDeviceDomain mesDeviceDomain = new MesDeviceDomain();
if(StringUtils.isBlank(palletDeviceBinding.getDeviceCode()) if(StringUtils.isBlank(palletDeviceBinding.getDeviceCode())
|| palletDeviceBinding.getCalibrationConcentration()!= null || palletDeviceBinding.getCalibrationConcentration()== null
|| StringUtils.isBlank(palletDeviceBinding.getCalibrationConcentrationStatus()) || StringUtils.isBlank(palletDeviceBinding.getCalibrationConcentrationStatus())
|| StringUtils.isBlank(palletDeviceBinding.getConcentration()) || StringUtils.isBlank(palletDeviceBinding.getConcentration())
|| palletDeviceBinding.getRealTimeAd() == null || palletDeviceBinding.getRealTimeAd() == null
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment