Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -76,14 +76,8 @@ public class ProductUtils {
      * @throws Exception
      */
     public static ModelMap updateProductUsersByBatch(List<ProductUsers> productUsers) throws Exception {
-        HashMap<String, Object> params = new HashMap<>();
-        params.put("data", FlexJsonUtils.toJsonDeep(productUsers));
-        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/productuser/save", params);
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
-            if (null != res.getResponseText()) {
-                return new ModelMap("success", "批量保存个人物料成功");
-            }
-        } else {
+        String res = HttpUtil.doPost(PRODUCT_PUBLIC_SERVICE_URL + "/productuser/save", FlexJsonUtils.toJsonDeep(productUsers));
+        if (null == res) {
             throw new RuntimeException("批量保存个人物料失败");
         }
         return null;
@@ -100,15 +94,9 @@ public class ProductUtils {
     public static Long updateProductUsersOne(ProductUsers productUser) throws Exception {
         List<ProductUsers> productUsers = new ArrayList<>();
         productUsers.add(productUser);
-        HashMap<String, Object> params = new HashMap<>();
-        params.put("data", FlexJsonUtils.toJsonDeep(productUsers));
-        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/productuser/save", params);
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
-            if (null != res.getResponseText()) {
-                return Long.valueOf(res.getResponseText());
-            }
-        } else {
-            throw new RuntimeException("保存单个个人物料失败");
+        String res = HttpUtil.doPost(PRODUCT_PUBLIC_SERVICE_URL + "/productuser/save", FlexJsonUtils.toJsonDeep(productUsers));
+        if (null == res) {
+            throw new RuntimeException("保存个人物料失败");
         }
         return null;
     }

src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -218,22 +218,23 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					// 判断是否存在
 					List<Product> prods = productDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(),
 							product.getCode());
-					if (CollectionUtils.isEmpty(prods)) {
-					} else {
-						Product oldProd = prods.get(0);
-						if (oldProd.getIsSale() == null) {
-							oldProd.setIsSale(Constant.YES);
-                            ProductUtils.updateOne(oldProd);
+					if (!CollectionUtils.isEmpty(prods)) {
+						// 如果存在且不是ERP传来的物料，允许修改
+						if (!"ERP".equals(prods.get(0).getSourceApp())) {
+							product.setId(prods.get(0).getId());
+							alters.add(product.getCode());
+						} else {
+							// ERP上传的物料不更新
+							infos.add(product.getCode());
+							product.setCode(null);
 						}
-						alters.add(product.getCode());
-						product.setCode(null);
 					}
 					product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 					product.setUserUU(SystemSession.getUser().getUserUU());
-					product.setSourceApp("B2B");
 					product.setIsPubsale(Constant.NO);
 					product.setIsShow(Constant.NO);
 					product.setIsSale(Constant.YES);
+					product.setSourceApp("B2B");
 					if (alters.size() > 0) {
 						modelMap.put("alters", alters);
 					}
@@ -258,7 +259,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 //					saveUserOrders(products);
 					modelMap.put("success", products.size());
 				} catch (Exception e) {
-					modelMap.put("error", "存在编号相同的产品");
+					modelMap.put("error", "上传出现问题");
 				}
 			}
 		}

src/main/resources/prod/sys.properties

@@ -11,7 +11,7 @@ reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${prof
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
 
 #product service url
-productServiceUrl=https://api-product.usoftmall.com/ 
+productServiceUrl=https://api-product.usoftmall.com/
 
 #inquiry service url
 inquiryServiceUrl=https://api-inquiry.usoftmall.com/

src/main/webapp/resources/js/index/app.js

@@ -13620,9 +13620,12 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             if (newvalue == '' || newvalue == null) {
                 toaster.pop('error', '提示', '修改的值不能为空');
             } else {
+                $scope.loading = true;
                 Products.alterByBatch({parameter: $scope.parameter}, {}, function (data) {
+                    $scope.loading = false;
                     $modalInstance.close(data);
                 }, function (response) {
+                    $scope.loading = false;
                     toaster.pop('error', '提示', response.data);
                 });
             }
@@ -21272,7 +21275,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 开启销售
         $scope.unlock = function (id) {
+            $scope.loading = true;
             Products.unlock({id: id}, {}, function (data) {
+                $scope.loading = false;
                 toaster.pop('success', '提示', '操作成功');
                 $scope.tableParams.reload();
             }, function (response) {
@@ -21282,7 +21287,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 关闭销售
         $scope.lock = function (id) {
+            $scope.loading = true;
             Products.lock({id: id}, {}, function (data) {
+                $scope.loading = false;
                 toaster.pop('success', '提示', '操作成功');
                 $scope.tableParams.reload();
             }, function (response) {
@@ -21292,7 +21299,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 开启购买
         $scope.unlockPurc = function (id) {
+            $scope.loading = true;
             Products.unlockPurc({id: id}, {}, function (data) {
+                $scope.loading = false;
                 toaster.pop('success', '提示', '操作成功');
                 $scope.tableParams.reload();
             }, function (response) {
@@ -21302,7 +21311,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 关闭购买
         $scope.lockPurc = function (id) {
+            $scope.loading = true;
             Products.lockPurc({id: id}, {}, function (data) {
+                $scope.loading = false;
                 toaster.pop('success', '提示', '操作成功');
                 $scope.tableParams.reload();
             }, function (response) {
@@ -21414,9 +21425,12 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 转入我的产品库
         $scope.addtoUser = function(id) {
+            $scope.loading = true;
             prodUser.coverToUser({id: id}, {}, function(data) {
+                $scope.loading = false;
                 toaster.pop('success', '提示', '转入成功');
             }, function(res) {
+                $scope.loading = false;
                 toaster.pop('error', '提示', '转入失败');
             });
         }

src/main/webapp/resources/tpl/index/baseInfo/uploadByBatch.html

@@ -300,15 +300,15 @@ table.table.table-striped  thead {
 	</div>
 	<div class="box-item" ng-hide="box3Closed">
 		<p ng-if="result">
-			<div ng-if="result">
-				总共上传产品<span class="text-inverse">{{result.total}}</span>个，上传成功<span class="text-inverse">{{result.success || 0}}</span>个
-			</div>
-			<div ng-repeat="alter in alters">
-				产品 <span class="text-inverse">{{alter}}</span> 已存在，上传失败
-			</div>
-			<div ng-repeat="info in infos">
-				<span class="text-inverse">{{info}}</span>
-			</div>
+		<div ng-if="result">
+			总共上传物料<span class="text-inverse">{{result.total}}</span>个，上传成功<span class="text-inverse">{{result.success || 0}}</span>个
+		</div>
+		<div ng-repeat="alter in alters">
+			物料 <span class="text-inverse">{{alter}}</span> 已存在，更新成功
+		</div>
+		<div ng-repeat="info in infos">
+			物料 <span class="text-inverse">{{info}}</span> 是从UAS上传的物料，请在UAS系统内更新
+		</div>
 		</p>
 	</div>
 	<div class="headerline">