zx 3 rokov pred
rodič
commit
ba150c3d2c

+ 2 - 1
src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java

@@ -29,5 +29,6 @@ public interface RmsMaterialMapper extends IBaseMapper<RmsMaterial, BigDecimal>
 // 根据汽车衡测量的物资id,进行展示物资
     List<Map<String, Object>> getCalculateOfMaterialList(Map<String, Object> mapVal);
 
-    int selectMaterialByCode(String materialCode);
+    //通过物资名称查找是否存在同样的位置
+    int selectMaterialByMaterialName(String materialName);
 }

+ 13 - 8
src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java

@@ -142,14 +142,19 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
      */
     @Override
     public int insertMaterial(RmsMaterial rmsMaterial) {
-        String code="lx";
-        Integer id=rmsMaterialMapper.getMaterialId().intValue();
-        String materialCode=DataChange.generateEightDigitsNumber(code,id);
-                rmsMaterial.setMaterialCode(materialCode);
-                rmsMaterial.setDeleted(new BigDecimal(0));
-                rmsMaterial.setMaterialId(new BigDecimal(id));
-                rmsMaterial.setInsertTime(new Date());
-                rmsMaterial.setInsertUsername("admin");
+        int i = rmsMaterialMapper.selectMaterialByMaterialName(rmsMaterial.getMaterialName());
+        if (i<0) {
+            String code = "lx";
+            Integer id = rmsMaterialMapper.getMaterialId().intValue();
+            String materialCode = DataChange.generateEightDigitsNumber(code, id);
+            rmsMaterial.setMaterialCode(materialCode);
+            rmsMaterial.setDeleted(new BigDecimal(0));
+            rmsMaterial.setMaterialId(new BigDecimal(id));
+            rmsMaterial.setInsertTime(new Date());
+            rmsMaterial.setInsertUsername("admin");
+        }else {
+            return -1;
+        }
         return rmsMaterialMapper.insertSelective(rmsMaterial);
     }
 

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/rms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
       date-format: yyyy-MM-dd HH:mm:ss
       time-zone: GMT+8

+ 2 - 2
src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml

@@ -696,7 +696,7 @@
         </where>
     </select>
 
-    <select id="selectMaterialByCode" resultType="int" parameterType="java.lang.String">
-        select count(*) from RMS_MATERIAL RM where RM.MATERIAL_CODE=#{materialCode} and RM.DELETED!=1
+    <select id="selectMaterialByMaterialName" resultType="int" parameterType="java.lang.String">
+        select count(*) from RMS_MATERIAL RM where RM.MATERIAL_NAME=#{materialName} and RM.DELETED!=1
     </select>
 </mapper>