Jelajahi Sumber

增加非标物料提交申请

wangyc 8 tahun lalu
induk
melakukan
738c18baa3

+ 6 - 1
src/main/java/com/uas/platform/b2c/prod/commodity/controller/ProductController.java

@@ -226,8 +226,13 @@ public class ProductController {
 		return productService.findByProductId(id);
 	}
 
+	/**
+	 * 提交申请
+	 * @param jsonObject
+	 * @return
+	 */
 	@RequestMapping(value = "/validition", method = RequestMethod.POST)
-	private  Component validitionStandard(@RequestBody JSONObject jsonObject) {
+	private ResultMap validitionStandard(@RequestBody JSONObject jsonObject) {
 		return productService.validitonStandard(jsonObject);
 	}
 }

+ 1 - 1
src/main/java/com/uas/platform/b2c/prod/commodity/service/ProductService.java

@@ -131,5 +131,5 @@ public interface ProductService {
      * 验证物料申请是否为标准物料
      * @return
      */
-    Component validitonStandard(JSONObject jsonObject);
+    ResultMap validitonStandard(JSONObject jsonObject);
 }

+ 5 - 3
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -632,7 +632,7 @@ public class ProductServiceImpl implements ProductService {
     }
 
     @Override
-    public Component validitonStandard(JSONObject jsonObject) {
+    public ResultMap validitonStandard(JSONObject jsonObject) {
         Component component = (Component)jsonObject.get("component");
         if (component == null || component.getCode() == null)
             throw new IllegalOperatorException("请填写器件原厂型号");
@@ -659,10 +659,12 @@ public class ProductServiceImpl implements ProductService {
             submit.setDefinetime(new Date());
             submit.setIsUpdate(0);
             submit.setKindid(kind.getId());
-
             componentSubmitDao.save(submit);
+
+            return ResultMap.success("提交申请成功,请等待审核结果");
+        } else {
+            return ResultMap.success("已存在此器件");
         }
-        return null;
     }
 }
 

+ 4 - 0
src/main/webapp/resources/js/common/query/material.js

@@ -47,6 +47,10 @@ define([ 'ngResource' ], function() {
             getProductDetail : {
                 url: 'trade/products/detail/:id',
                 method: 'GET'
+            },
+            submitProduct: {
+                url: 'trade/products/validition',
+                method: 'POST'
             }
         });
     }]);

+ 12 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -1151,10 +1151,20 @@ define([ 'app/app' ], function(app) {
 		//上传规格书
 		$scope.onAttachInput = function (event) {
 			$scope.attachName = event.target.files[0].name;
-		}
+		};
 		$scope.deleteAttach = function () {
 			$scope.attachName = '';
-		}
+		};
+
+		Material.submitProduct({}, $scope.submitProduct, function (data) {
+			if (data.data == '已存在此器件') {
+				toaster.pop('info',  '已存在此器件');
+			} else {
+				toaster.pop('info', data.data);
+			}
+		}, function (response) {
+			toaster.pop('error', response.data);
+		})
 
 	}]);