Merge branch 'master' of lsp/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java

@@ -886,7 +886,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     storeRelaEntity.setBatchExpireDate(sdf.format(batchExpireDate));
                 }else{
-                    throw new RRException("商品[" + storeGoodsDto.getGoodsSn() + "]的批次号不存在");
+//                    throw new RRException("商品[" + storeGoodsDto.getGoodsSn() + "]的批次号不存在");
                 }
                 storeRelaEntity.setMarketPrice(new BigDecimal(storeGoodsDto.getMarketPrice()));
                 storeRelaEntity.setRetailPrice(new BigDecimal(storeGoodsDto.getRetailPrice()));

kmall-admin/src/main/webapp/WEB-INF/page/shop/goods.html

@@ -151,7 +151,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">商品导入</i-button>
                     </Upload>
                 </i-col>
-                #end
+                #end 0
                 #if($shiro.hasPermission("goods:generalGoodsUpload"))
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
@@ -463,7 +463,10 @@
                     <Modal title="查看图片" v-model="visible">
                         <img :src="imgName" v-if="visible" style="width: 100%"/>
                     </Modal>
-                    <span style="color: red;font-size: 12px;">* 商品详情轮播图，尺寸建议750x750（正方形模式）像素以内，大小100k以内</span>
+                    <div style="display: inline-block;">
+                        <span style="color: red;font-size: 20px;display: block;">（仅用于线上业务商品详情录入）</span>
+                        <span style="color: red;font-size: 12px;">* 商品详情轮播图，尺寸建议750x750（正方形模式）像素以内，大小100k以内</span>
+                    </div>
                 </template>
                 <div id="goodsDesc"></div>
             </Tab-Pane>

kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsexportpdf.html

@@ -39,7 +39,7 @@
         <Row :gutter="16">
         <div class="row" style="border:0;margin-bottom:10px">
 <!--            <i-button  v-bind:disabled="selectButtonDisabled"  @click="selectLabelHead" >选择标签头</i-button>-->
-            <i-button type="primary" @click="exportPdf"><i class="fa fa-cloud-download"></i>&nbsp;导出pdf</i-button>
+            <i-button type="primary" @click="exportPdf"><i class="fa fa-cloud-download"></i>&nbsp;标签pdf制作</i-button>
             <i-col span="3">
                 <i-select v-model="q.storeId" placeholder="门店" filterable label-in-value>
                     <i-option v-for="store in stores" :value="store.id"

kmall-admin/src/main/webapp/WEB-INF/page/shop/storeProductStock.html

@@ -165,10 +165,10 @@
             </Form-item>
             <Form-item label="商品" prop="goodsId">
                 <i-select v-model="productStoreRela.goodsId" filterable @on-change="changeGoods" label-in-value  v-show="isOperatorShow" disabled>
-                    <i-option v-for="goods in goodsList" :value="goods.id" :key="goods.id">{{goods.name}}（{{goods.goodsBizType=='00'?'保税备货':''}}{{goods.goodsBizType=='02'?'保税展示补货':''}}{{goods.goodsBizType=='10'?'门店店提':''}}{{goods.goodsBizType=='11'?'普通货物':''}}）</i-option>
+                    <i-option v-for="goods in goodsList" :value="goods.id" :key="goods.id">{{goods.name}}（{{goods.goodsBizType=='00'?'保税备货':''}}{{goods.goodsBizType=='02'?'保税展示补货':''}}{{goods.goodsBizType=='10'?'现场速递':''}}{{goods.goodsBizType=='11'?'普通货物':''}}）</i-option>
                 </i-select>
                 <i-select v-model="productStoreRela.goodsId" filterable @on-change="changeGoods" label-in-value  v-show="!isOperatorShow">
-                    <i-option v-for="goods in goodsList" :value="goods.id" :key="goods.id">{{goods.name}}（{{goods.goodsBizType=='00'?'保税备货':''}}{{goods.goodsBizType=='02'?'保税展示补货':''}}{{goods.goodsBizType=='10'?'门店店提':''}}{{goods.goodsBizType=='11'?'普通货物':''}}）</i-option>
+                    <i-option v-for="goods in goodsList" :value="goods.id" :key="goods.id">{{goods.name}}（{{goods.goodsBizType=='00'?'保税备货':''}}{{goods.goodsBizType=='02'?'保税展示补货':''}}{{goods.goodsBizType=='10'?'现场速递':''}}{{goods.goodsBizType=='11'?'普通货物':''}}）</i-option>
                 </i-select>
             </Form-item>
             <div v-show="isStockShare"><span style="margin-left: 80px;color: red;font-size: 12px;">* 该门店商品所选供应商第三方商户是共享库存，门店库存则为商户商品总库存，不需要编辑</span></div>
@@ -300,10 +300,10 @@
             </Form-item>
             <Form-item label="商品" prop="goodsId">
                 <i-select v-model="productStoreRela.goodsId" filterable @on-change="changeSupplerGoods" label-in-value  v-show="isSupplierOperatorShow" disabled>
-                    <i-option v-for="goods in goodss" :value="goods.id" :key="goods.id">{{goods.name}}（{{goods.goodsBizType=='00'?'保税备货':''}}{{goods.goodsBizType=='02'?'保税展示补货':''}}{{goods.goodsBizType=='10'?'门店店提':''}}{{goods.goodsBizType=='11'?'普通货物':''}}）</i-option>
+                    <i-option v-for="goods in goodss" :value="goods.id" :key="goods.id">{{goods.name}}（{{goods.goodsBizType=='00'?'保税备货':''}}{{goods.goodsBizType=='02'?'保税展示补货':''}}{{goods.goodsBizType=='10'?'现场速递':''}}{{goods.goodsBizType=='11'?'普通货物':''}}）</i-option>
                 </i-select>
                 <i-select v-model="productStoreRela.goodsId" filterable @on-change="changeSupplerGoods" label-in-value  v-show="!isSupplierOperatorShow">
-                    <i-option v-for="goods in goodss" :value="goods.id" :key="goods.id">{{goods.name}}（{{goods.goodsBizType=='00'?'保税备货':''}}{{goods.goodsBizType=='02'?'保税展示补货':''}}{{goods.goodsBizType=='10'?'门店店提':''}}{{goods.goodsBizType=='11'?'普通货物':''}}）</i-option>
+                    <i-option v-for="goods in goodss" :value="goods.id" :key="goods.id">{{goods.name}}（{{goods.goodsBizType=='00'?'保税备货':''}}{{goods.goodsBizType=='02'?'保税展示补货':''}}{{goods.goodsBizType=='10'?'现场速递':''}}{{goods.goodsBizType=='11'?'普通货物':''}}）</i-option>
                 </i-select>
             </Form-item>
             <div v-show="isSupplierStockShare"><span style="margin-left: 80px;color: red;font-size: 12px;">* 该门店商品所选供应商第三方商户是共享库存，门店库存则为商户商品总库存，不需要编辑</span></div>

kmall-common/src/main/java/com/kmall/common/fileserver/util/FileManager.java

@@ -127,8 +127,6 @@ public class FileManager implements Serializable {
      * <strong>方法概要： 文件下载</strong> <br>
      * <strong>创建时间： 2016-9-26 上午10:28:21</strong> <br>
      *
-     * @param String groupName
-     * @param String remoteFileName
      * @return returned value comment here
      * @author Wang Liang
      */