|
|
@@ -1,13 +1,5 @@
|
|
|
package com.uas.mes.pm.service.impl;
|
|
|
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-
|
|
|
-import com.uas.mes.core.util.StringUtil;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
-
|
|
|
import com.uas.mes.common.data.BaseDao;
|
|
|
import com.uas.mes.common.data.SqlUtil;
|
|
|
import com.uas.mes.common.entity.Employee;
|
|
|
@@ -17,7 +9,14 @@ import com.uas.mes.common.util.BaseUtil;
|
|
|
import com.uas.mes.core.data.SqlRowList;
|
|
|
import com.uas.mes.core.util.CollectionUtil;
|
|
|
import com.uas.mes.core.util.FlexJsonUtil;
|
|
|
+import com.uas.mes.core.util.StringUtil;
|
|
|
import com.uas.mes.pm.service.SNBatchService;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
+
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
@Service("SNBatchService")
|
|
|
public class SNBatchServiceImpl implements SNBatchService {
|
|
|
@@ -43,7 +42,9 @@ public class SNBatchServiceImpl implements SNBatchService {
|
|
|
SqlRowList rs0;
|
|
|
List<Map<Object, Object>> gstore = BaseUtil.parseGridStoreToMaps(gridStore);
|
|
|
int em_id = SystemSession.getUser().getEm_id();
|
|
|
- String rep = CollectionUtil.getRepeats(gstore, "sb_sncode").trim();
|
|
|
+ String rep = CollectionUtil.getRepeats(gstore, "sb_sncode");
|
|
|
+ if(rep!=null)
|
|
|
+ rep = rep.trim();
|
|
|
if(!StringUtil.isEmpty(rep)){//重复行
|
|
|
BaseUtil.showError("SN号："+rep+"出现多行");
|
|
|
}
|
