完善

platform-dao/src/main/java/com/platform/dao/util/CustomExcelImportUtil.java

@@ -1379,7 +1379,7 @@ public class CustomExcelImportUtil {
                 if(row.getPhysicalNumberOfCells()>20){
                     record.setIsChild(getChild(row.getCell(20).getStringCellValue().trim()));
                     record.setIsShow(getShow(row.getCell(21).getStringCellValue().trim()));
-                    record.setPositionId(row.getCell(22).getStringCellValue().trim());
+                    record.setPositionName(row.getCell(22).getStringCellValue().trim());
                 }else{// 默认值
                     record.setIsChild(SbInfoChildEnum.IS_NORMAL.getValue());
                     record.setIsShow(SbInfoShowEnum.NOT_SHOW.getValue());

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -134,7 +134,7 @@ public class ExportSbInfoVO implements Serializable {
     /**
      * 存放位置
      */
-    @Excel(name = "存放位置", orderNum = "23")
-    private String positionId;
+    @Excel(name = "所属车间", orderNum = "23")
+    private String positionName;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -376,7 +376,7 @@ public class SbInfoVO extends BaseVO implements Serializable {
     private String guigeName;
 
     /**
-     * 位置名称
+     * 所属车间
      */
     private String positionName;
 

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -123,7 +123,6 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     private final SbModelMapper sbModelMapper;
 
     private final FirmProducerMapper firmProducerMapper;
-
     private final SysDeptRelationService sysDeptRelationService;
 
     private final PartInfoService partInfoService;
@@ -1612,11 +1611,25 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     List<SbInfoVO> addItems = new ArrayList<SbInfoVO>();
                     List<SysUser> users = sysUserMapper.selectAll();
                     List<FirmProducer> producerList = firmProducerMapper.selectAll();
+                    List<SbPosition> positionList = sbPositionMapper.selectAll();
                     LocalDateTime now = LocalDateTime.now();
                     for (SbInfoVO item : items) {
+
+                        boolean findPosition= false;
+                        for (SbPosition position : positionList) {
+                            if (position.getName().equalsIgnoreCase(item.getPositionName())) {
+                                item.setPositionId(position.getId());
+                                findPosition = true;
+                                break;
+                            }
+                        }
+                        if (!findPosition) {
+                            throw new BusinessException("系统找不到车间名称，请先添加车间, 车间名称" + item.getPositionName());
+                        }
+
                         boolean findSaveUser = false;
                         for (SysUser user : users) {
-                            if (user.getRealName().equals(item.getSaveUserName())) {
+                            if (user.getRealName().equalsIgnoreCase(item.getSaveUserName())) {
                                 item.setSaveUser(user.getUserId());
                                 item.setUseUser(user.getUserId());
                                 findSaveUser = true;
@@ -1629,7 +1642,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                         if (StringUtils.isNotBlank(item.getRepairUserName())) {
                             boolean findRepairUser = false;
                             for (SysUser user : users) {
-                                if (user.getRealName().equals(item.getRepairUserName())) {
+                                if (user.getRealName().equalsIgnoreCase(item.getRepairUserName())) {
                                     item.setRepairUser(user.getUserId());
                                     findRepairUser = true;
                                     break;
@@ -1642,7 +1655,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                         if (StringUtils.isNotBlank(item.getRepairUserNameSecond())) {
                             boolean findRepairUser = false;
                             for (SysUser user : users) {
-                                if (user.getRealName().equals(item.getRepairUserNameSecond())) {
+                                if (user.getRealName().equalsIgnoreCase(item.getRepairUserNameSecond())) {
                                     item.setRepairUserSecond(user.getUserId());
                                     findRepairUser = true;
                                     break;
@@ -1656,7 +1669,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                         List<SbType> typeList = sbTypeMapper.selectAll();
                         boolean find = false;
                         for (SbType type : typeList) {
-                            if (type.getName().equals(item.getTypeName())) {
+                            if (type.getName().equalsIgnoreCase(item.getTypeName())) {
                                 item.setTypeId(type.getId());
                                 find = true;
                                 break;
@@ -1668,7 +1681,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
 
                         boolean findProdcuer = false;
                         for (FirmProducer producer : producerList) {
-                            if (producer.getName().equals(item.getProducerId())) {
+                            if (producer.getName().equalsIgnoreCase(item.getProducerId())) {
                                 item.setProducerId(producer.getId());
                                 findProdcuer = true;
                                 break;