瀏覽代碼

批量修改上传模版验证不通过问题处理,物料匹配报错处理。

dongbw 7 年之前
父節點
當前提交
3b68138f68

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

@@ -1200,7 +1200,7 @@ public class ProductServiceImpl implements ProductService {
             productPrivate.setB2cEnabled(IntegerConstant.YES_SHORT);
         }
         Integer count = productPrivate.getBatchCount();
-        productPrivate.setBatchCount(count + saveList.size());
+        productPrivate.setBatchCount((null != count ? count : 0) + saveList.size());
         productPrivateDao.save(productPrivate);
         goodsHistoryDao.save(historyList);
     }

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

@@ -587,7 +587,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		Object skuCellObj = readWorkBookCell(headerRow.getCell(ModifyConstant.SKU_CODE), Cell.CELL_TYPE_STRING,
 				1, ModifyConstant.SKU_CODE);
 		String skuStr = StringUtilB2C.getStr(skuCellObj);
-		if (StringUtilB2C.isEmpty(skuCellObj) || !"SKU编码(必填项)".equals(skuStr)) {
+		if (StringUtilB2C.isEmpty(skuCellObj) || !"SKU编码(不可修改)".equals(skuStr)) {
 			throw new IllegalOperatorException("表格模板不正确!请重新下载最新模板");
 		}
 	}

+ 1 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_onSaleCtrl.js

@@ -1,6 +1,6 @@
 define([ 'app/app' ], function(app) {
     'use strict';
-    app.register.controller('vendor_onSaleCtrl', ['$scope', '$rootScope', 'Goods', '$modal', 'toaster', 'Loading', 'StoreInfo', 'AuthenticationService', '$q', 'StoreCms', 'NumberService', 'Enterprise', 'ByteCountService', 'DistributionRule', '$upload', function ($scope, $rootScope, Goods, $modal, toaster, Loading, StoreInfo, AuthenticationService, $q, StoreCms, NumberService, Enterprise, ByteCountService, DistributionRule, $upload) {
+    app.register.controller('vendor_onSaleCtrl', ['$scope', '$rootScope', 'Goods', '$modal', 'toaster', 'Loading', 'StoreInfo', 'AuthenticationService', '$q', 'StoreCms', 'NumberService', 'Enterprise', 'ByteCountService', 'DistributionRule', '$upload', '$http', function ($scope, $rootScope, Goods, $modal, toaster, Loading, StoreInfo, AuthenticationService, $q, StoreCms, NumberService, Enterprise, ByteCountService, DistributionRule, $upload, $http) {
         $rootScope.active = 'vendor_material';
         $scope.keyword = '';
         $scope.tab = 'onSale';