zhs 2 år sedan
förälder
incheckning
45bc18f1a9
1 ändrade filer med 17 tillägg och 17 borttagningar
  1. 17 17
      src/main/java/com/tld/service/impl/MaterialClassServiceImpl.java

+ 17 - 17
src/main/java/com/tld/service/impl/MaterialClassServiceImpl.java

@@ -63,17 +63,17 @@ public class MaterialClassServiceImpl implements MaterialClassService {
                 map.put("errMsg","未查找到物料信息");
                 return map;
             }
-            String wllbCode = materialClassMapper.getMaterialClassStorageLocation(materialClass.getStorageLocationCode());
-            if(!materialClass.getWllbCode().equals(wllbCode) && wllbCode != null){
-                map.put("msg", "500");
-                map.put("errMsg", "库位已被占用");
-                return map;
-            }
-            if(materialClass.getWllbCode().equals(wllbCode)) {
-                map.put("msg", "500");
-                map.put("errMsg", "切勿重复录入");
-                return map;
-            }
+//            String wllbCode = materialClassMapper.getMaterialClassStorageLocation(materialClass.getStorageLocationCode());
+//            if(!materialClass.getWllbCode().equals(wllbCode) && wllbCode != null){
+//                map.put("msg", "500");
+//                map.put("errMsg", "库位已被占用");
+//                return map;
+//            }
+//            if(materialClass.getWllbCode().equals(wllbCode)) {
+//                map.put("msg", "500");
+//                map.put("errMsg", "切勿重复录入");
+//                return map;
+//            }
             materialClass.setModifyUser(request.getHeader("userId"));
             materialClassMapper.addMaterialClass(materialClass);
             map.put("msg", "200");
@@ -96,12 +96,12 @@ public class MaterialClassServiceImpl implements MaterialClassService {
                 map.put("errMsg","未查找到物料信息");
                 return map ;
             }
-            String wllbCode = materialClassMapper.getMaterialClassStorageLocation(materialClass.getStorageLocationCode());
-            if( wllbCode != null && !wllbCode.equals(materialClass.getWllbCode())){
-                map.put("msg", "500");
-                map.put("errMsg", "库位已被占用");
-                return map;
-            }
+//            String wllbCode = materialClassMapper.getMaterialClassStorageLocation(materialClass.getStorageLocationCode());
+//            if( wllbCode != null && !wllbCode.equals(materialClass.getWllbCode())){
+//                map.put("msg", "500");
+//                map.put("errMsg", "库位已被占用");
+//                return map;
+//            }
             materialClass.setModifyUser(request.getHeader("userId"));
             materialClassMapper.updateMaterialClass(materialClass);
             map.put("msg", "200");