'修改物资接口'

pom.xml

@@ -169,7 +169,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <table>RMS_CONSIGNEE</table>
+<!--                        <table>RMS_</table>-->
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.java

@@ -15,6 +15,6 @@ public interface RmsMaterialTypeMapper extends IBaseMapper<RmsMaterialType, BigD
     @Override
     List<RmsMaterialType> selectByParameters(Map<String, Object> parameters);
 
-//    @Select("select seq__RMS_MATERIAL.nextval from dual")
-//    BigDecimal getMaterialId();
+    @Select("select seq__RMS_MATERIAL_TYPE.nextval from dual")
+    BigDecimal getMaterialId();
 }

src/main/java/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.RmsUnitOfMeasure;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -13,4 +14,7 @@ public interface RmsUnitOfMeasureMapper extends IBaseMapper<RmsUnitOfMeasure, Bi
 
     @Override
     List<RmsUnitOfMeasure> selectByParameters(Map<String, Object> parameters);
+
+    @Select("select seq__RMS_UNIT_MEASURE.nextval from dual")
+    BigDecimal getUnitOfMeasureId();
 }

src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java

@@ -78,26 +78,54 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         Map<String,Object> map2 = new HashMap<>();
         map2.put("materialTypeName",materialTypeName);
         List<RmsMaterialType> rmsMaterialTypes = rmsMaterialTypeMapper.selectByParameters(map2);
-        RmsMaterialType rmsMaterialType = rmsMaterialTypes.get(0);
+        RmsMaterial rmsMaterial = new RmsMaterial();
+        if (rmsMaterialTypes.size() == 0) {
+            RmsMaterialType rmsMaterialType = new RmsMaterialType();
+            rmsMaterialType.setMaterialTypeId(rmsMaterialTypeMapper.getMaterialId());
+            rmsMaterialType.setMaterialTypeName(materialTypeName);
+            rmsMaterialType.setInsertTime(new Date());
+            rmsMaterialType.setInsertUsername("admin");
+            rmsMaterialType.setUpdateTime(new Date());
+            rmsMaterialType.setUpdateUsername("admin");
+            rmsMaterialType.setInsertUpdateRemark("采集金蝶数据");
+            rmsMaterialTypeMapper.insertSelective(rmsMaterialType);
+            rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
+        }
+        else {
+            RmsMaterialType rmsMaterialType = rmsMaterialTypes.get(0);
+            rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
+        }
         // 判断单位是否已存在
         Map<String,Object> map3 = new HashMap<>();
-        map3.put("unitOfMeasure",unitOfMeasure);
+        map3.put("unitOfMeasureName",unitOfMeasure);
         List<RmsUnitOfMeasure> rmsUnitOfMeasures = rmsUnitOfMeasureMapper.selectByParameters(map3);
-        RmsUnitOfMeasure rmsUnitOfMeasure = rmsUnitOfMeasures.get(0);
-        RmsMaterial rmsMaterial = new RmsMaterial();
+        if (rmsUnitOfMeasures.size() == 0) {
+            RmsUnitOfMeasure rmsUnitOfMeasure = new RmsUnitOfMeasure();
+            rmsUnitOfMeasure.setUnitOfMeasureId(rmsUnitOfMeasureMapper.getUnitOfMeasureId());
+            rmsUnitOfMeasure.setUnitOfMeasureName(unitOfMeasure);
+            rmsUnitOfMeasure.setInsertTime(new Date());
+            rmsUnitOfMeasure.setInsertUsername("admin");
+            rmsUnitOfMeasure.setUpdateTime(new Date());
+            rmsUnitOfMeasure.setUpdateUsername("admin");
+            rmsUnitOfMeasure.setInsertUpdateRemark("采集金蝶数据");
+            rmsUnitOfMeasureMapper.insertSelective(rmsUnitOfMeasure);
+            rmsMaterial.setUnitOfMeasureId(rmsUnitOfMeasure.getUnitOfMeasureId());
+        }
+        else {
+            RmsUnitOfMeasure rmsUnitOfMeasure = rmsUnitOfMeasures.get(0);
+            rmsMaterial.setUnitOfMeasureId(rmsUnitOfMeasure.getUnitOfMeasureId());
+        }
         rmsMaterial.setMaterialName(materialName);
         rmsMaterial.setMaterialCode(materialCode);
         rmsMaterial.setMaterialSpecification(materialSpecification);
         rmsMaterial.setMaterialModel(materialModel);
         rmsMaterial.setMaterialLength(materialLength);
         rmsMaterial.setEasMaterialId(EASMaterialId);
-        rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
-        rmsMaterial.setUnitOfMeasureId(rmsUnitOfMeasure.getUnitOfMeasureId());
         rmsMaterial.setInsertTime(new Date());
         rmsMaterial.setInsertUsername("admin");
         rmsMaterial.setUpdateTime(new Date());
         rmsMaterial.setUpdateUsername("admin");
-        rmsMaterial.setInsertUpdateRemark("无");
+        rmsMaterial.setInsertUpdateRemark("采集金蝶数据");
         int result = 0;
         // 新增
         if (rmsMaterials.size() == 0) {