对接修改

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/checkRecord/IsMaterialsCheckRecordVO.java

@@ -80,10 +80,10 @@ public class IsMaterialsCheckRecordVO extends BaseBean
     private String reason;
 
     @ApiModelProperty(value = "措施")
+    @Excel(name = "措施")
     private String measure;
 
     @ApiModelProperty(value = "检察员")
-    @Excel(name = "检察员")
     private String checkUserName;
 
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/materials/ImportMaterialsVO.java

@@ -17,6 +17,13 @@ import java.util.Date;
 public class ImportMaterialsVO
 {
 
+    @ApiModelProperty(value = "物资柜ID")
+    private Long materialsCabinetId;
+
+    @ApiModelProperty(value = "物资柜Name")
+    @Excel(name = "物资柜")
+    private String cabinetName;
+
     @ApiModelProperty(value = "物资名称")
     @Excel(name = "物资名称")
     private String materialsName;
@@ -27,6 +34,9 @@ public class ImportMaterialsVO
     @Excel(name = "物资类型")
     private String materialsTypeName;
 
+    @Excel(name = "物资规格")
+    private String valueName;
+
     @ApiModelProperty(value = "物资RFID")
     @Excel(name = "RFID")
     private String materialsRfid;
@@ -40,4 +50,6 @@ public class ImportMaterialsVO
     @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expirationDate;
 
+    private String properties;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsMaterialsService.java

@@ -76,7 +76,7 @@ public interface IIsMaterialsService extends IService<IsMaterials>
 
     Boolean updateIsMaterialById(LoanMaterialDTO dto);
 
-    String importMaterials(List<ImportMaterialsVO> itemList, boolean updateSupport, String operName);
+    String importMaterials(List<ImportMaterialsVO> itemList, boolean updateSupport, String operName) throws JsonProcessingException;
 
     Boolean updateMaterialsBinding(MaterialBindingDTO dto);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsServiceImpl.java

@@ -11,8 +11,7 @@ import com.ktg.common.core.text.Convert;
 import com.ktg.common.exception.ServiceException;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.bean.BeanUtils;
-import com.ktg.iscs.domain.IsMaterials;
-import com.ktg.iscs.domain.IsMaterialsType;
+import com.ktg.iscs.domain.*;
 import com.ktg.iscs.domain.dto.materials.LoanMaterialDTO;
 import com.ktg.iscs.domain.dto.materials.MaterialBindingDTO;
 import com.ktg.iscs.domain.dto.materials.MaterialsPageDTO;
@@ -22,9 +21,7 @@ import com.ktg.iscs.domain.vo.materials.ImportMaterialsVO;
 import com.ktg.iscs.domain.vo.materials.MaterialsPageVO;
 import com.ktg.iscs.domain.vo.materials.PropertyVO;
 import com.ktg.iscs.mapper.IsMaterialsMapper;
-import com.ktg.iscs.service.IIsMaterialsLoanService;
-import com.ktg.iscs.service.IIsMaterialsService;
-import com.ktg.iscs.service.IIsMaterialsTypeService;
+import com.ktg.iscs.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +45,12 @@ public class IsMaterialsServiceImpl extends ServiceImpl<IsMaterialsMapper, IsMat
     private IIsMaterialsLoanService iIsMaterialsLoanService;
     @Autowired
     private IIsMaterialsTypeService iIsMaterialsTypeService;
+    @Autowired
+    private IIsMaterialsCabinetService iIsMaterialsCabinetService;
+    @Autowired
+    private IIsMaterialsPropertyService iIsMaterialsPropertyService;
+    @Autowired
+    private IIsMaterialsPropertyValueService iIsMaterialsPropertyValueService;
 
     /**
      * 查询物资
@@ -190,7 +193,7 @@ public class IsMaterialsServiceImpl extends ServiceImpl<IsMaterialsMapper, IsMat
 
     @Transactional
     @Override
-    public String importMaterials(List<ImportMaterialsVO> itemList, boolean updateSupport, String operName) {
+    public String importMaterials(List<ImportMaterialsVO> itemList, boolean updateSupport, String operName) throws JsonProcessingException {
         Assert.notNull(itemList, "导入物资数据不能为空！");
         int successNum = 0;
         int failureNum = 0;
@@ -205,7 +208,7 @@ public class IsMaterialsServiceImpl extends ServiceImpl<IsMaterialsMapper, IsMat
             // 2.-----------------检查物资名称不能为空-------------------------------
             if (StringUtils.isBlank(materials.getMaterialsName())) {
                 result = false;
-                failureMsg.append("<br/>" + failureNum + "、物资名称 " + materials.getMaterialsName() + " 不能为空");
+                failureMsg.append("<br/>" + failureNum + "、物资名称 :" + materials.getMaterialsName() + " 不能为空");
             }
             // 3.-----------------检查物资类型不能为空-------------------------------
             if (StringUtils.isNotBlank(materials.getMaterialsTypeName())) {
@@ -214,13 +217,13 @@ public class IsMaterialsServiceImpl extends ServiceImpl<IsMaterialsMapper, IsMat
                         .eq(IsMaterialsType::getMaterialsTypeName, materials.getMaterialsTypeName()));
                 if (materialsTypelist.isEmpty()) {
                     result = false;
-                    failureMsg.append("<br/>" + failureNum + "、物资分类 " + materials.getMaterialsName() + " 系统中无该物资类型");
+                    failureMsg.append("<br/>" + failureNum + "、物资分类 :" + materials.getMaterialsTypeName() + " 系统中无该物资类型");
                 } else {
                     materialsTypeId = materialsTypelist.get(0).getMaterialsTypeId();
                 }
             } else {
                 result = false;
-                failureMsg.append("<br/>" + failureNum + "、物资分类 " + materials.getMaterialsName() + " 不能为空");
+                failureMsg.append("<br/>" + failureNum + "、物资分类 :" + materials.getMaterialsName() + " 的物资分类不能为空");
             }
             // 4.---------------------检查rfid是否填写------------------------------
             if (StringUtils.isNotBlank(materials.getMaterialsRfid())) {
@@ -229,11 +232,36 @@ public class IsMaterialsServiceImpl extends ServiceImpl<IsMaterialsMapper, IsMat
                         .eq(IsMaterials::getMaterialsRfid, materials.getMaterialsRfid()));
                 if (!materialslist.isEmpty()) {
                     result = false;
-                    failureMsg.append("<br/>" + failureNum + "、物资RFID " + materials.getMaterialsRfid() + " 已被使用");
+                    failureMsg.append("<br/>" + failureNum + "、物资RFID :" + materials.getMaterialsRfid() + " 已被使用");
                 }
             } else {
                 result = false;
-                failureMsg.append("<br/>" + failureNum + "、物资RFID " + materials.getMaterialsName() + " 不能为空");
+                failureMsg.append("<br/>" + failureNum + "、物资RFID :" + materials.getMaterialsName() + " 的RFID不能为空");
+            }
+            // 5.---------------------检查物资柜信息------------------------------
+            if (StringUtils.isNotBlank(materials.getCabinetName())) {
+                List<IsMaterialsCabinet> cabinets = iIsMaterialsCabinetService.list(Wrappers.<IsMaterialsCabinet>lambdaQuery()
+                        .eq(IsMaterialsCabinet::getCabinetName, materials.getCabinetName()));
+                if (!cabinets.isEmpty()) {
+                    materials.setMaterialsCabinetId(cabinets.get(0).getCabinetId());
+                }
+            }
+            // 6.---------------------检查物资规格------------------------------
+            if (StringUtils.isNotBlank(materials.getValueName())) {
+                List<IsMaterialsPropertyValue> propertyValueList = iIsMaterialsPropertyValueService.list(Wrappers.<IsMaterialsPropertyValue>lambdaQuery()
+                        .eq(IsMaterialsPropertyValue::getValueName, materials.getValueName()));
+                if (!propertyValueList.isEmpty()) {
+                    IsMaterialsProperty property = iIsMaterialsPropertyService.getById(propertyValueList.get(0).getPropertyId());
+                    PropertyVO propertyVO = new PropertyVO();
+                    propertyVO.setPropertyId(String.valueOf(property.getPropertyId()));
+                    propertyVO.setPropertyName(property.getPropertyName());
+                    propertyVO.setRecordId(String.valueOf(propertyValueList.get(0).getRecordId()));
+                    propertyVO.setValueName(propertyValueList.get(0).getValueName());
+                    // 使用 ObjectMapper 将对象转换为 JSON 字符串
+                    ObjectMapper objectMapper = new ObjectMapper();
+                    String jsonString = objectMapper.writeValueAsString(propertyVO);
+                    materials.setProperties("[" + jsonString + "]");
+                }
             }
 
             // 开始做最后的插入操作