Merge branch 'dev-mysql' into liusw-account-v2.0.12.14

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -2,6 +2,8 @@ package com.uas.platform.b2c.common.account.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.uas.account.entity.UserView;
+import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
+import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.dao.UserLoginTimeDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.SigninLog;
@@ -52,6 +54,12 @@ public class SecurityController {
 	@Autowired
 	private UserLoginTimeDao userLoginTimeDao;
 
+	@Autowired
+	private EnterpriseDao enterpriseDao;
+
+	@Autowired
+	private UserDao userDao;
+
 	private final DeviceResolver deviceResolver = new LiteDeviceResolver();
 
 	/**
@@ -282,7 +290,18 @@ public class SecurityController {
 			if (authedUser != null && authedUser.getEnterprises() != null) {
 				// 企业资料在client系统自己的唯一标识，比如en_uu
 				if (tokenUser.getSpaceDialectUID() != null) {
-					authedUser.setCurrentEnterprise(Long.parseLong(tokenUser.getSpaceDialectUID()));
+					// 如果企业不存在则更新该企业
+					for (Enterprise enterprise : authedUser.getEnterprises()) {
+						if (enterprise.getUu().equals(Long.parseLong(tokenUser.getSpaceDialectUID()))){
+							authedUser.setEnterprise(enterprise);
+						}
+					}
+					if (null == authedUser.getEnterprise()) {
+						Enterprise newEnterprise = enterpriseDao.findByUu(Long.parseLong(tokenUser.getSpaceDialectUID()));
+						authedUser.getEnterprises().add(newEnterprise);
+						userDao.save(authedUser);
+						authedUser.setEnterprise(newEnterprise);
+					}
 				} else if (tokenUser.getSpaceUID() != null) {
 					for (Enterprise enterprise : authedUser.getEnterprises()) {
 						// 企业资料在所有系统公认的唯一标识，这里使用商业登记证号

src/main/java/com/uas/platform/b2c/external/erp/commodity/service/impl/BankInfoServiceImpl.java

@@ -7,8 +7,11 @@ import com.uas.platform.b2c.fa.payment.dao.BankInfoDao;
 import com.uas.platform.b2c.fa.payment.model.BankInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.model.Type;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 /**
  * Created by wangyc on 2017/11/10.
  *
@@ -24,14 +27,22 @@ public class BankInfoServiceImpl implements BankInfoService {
 
     @Override
     public BankInfoERP findOne() {
-        BankInfo bankInfo = bankInfoService.getEnterpriseBankInfoContainsStatus(Type.SUP.value(), Status.ALLOW.value()).get(0);
+        List<BankInfo> bankInfoList = bankInfoService.getEnterpriseBankInfoContainsStatus(Type.SUP.value(), Status.ALLOW.value());
+        if (CollectionUtils.isEmpty(bankInfoList)) {
+            return null;
+        }
+        BankInfo bankInfo = bankInfoList.get(0);
         BankInfoERP bankInfoERP = ModelConverter.convert(bankInfo);
         return bankInfoERP;
     }
 
     @Override
     public void callback(String erpNum) {
-        BankInfo bankInfo = bankInfoService.getEnterpriseBankInfoContainsStatus(Type.SUP.value(), Status.ALLOW.value()).get(0);
+        List<BankInfo> bankInfoList = bankInfoService.getEnterpriseBankInfoContainsStatus(Type.SUP.value(), Status.ALLOW.value());
+        if (CollectionUtils.isEmpty(bankInfoList)) {
+            return;
+        }
+        BankInfo bankInfo = bankInfoList.get(0);
         bankInfo.setErpNum(erpNum);
         bankInfoDao.save(bankInfo);
     }

src/main/java/com/uas/platform/b2c/external/erp/order/service/impl/B2cOrderServiceImpl.java

@@ -5,7 +5,9 @@ import com.uas.api.b2c_erp.buyer.model.B2cOrderDetail;
 import com.uas.api.b2c_erp.buyer.model.Payment;
 import com.uas.api.b2c_erp.buyer.service.B2cOrderService;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
+import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
@@ -22,6 +24,7 @@ import com.uas.platform.b2c.trade.order.dao.OrderDao;
 import com.uas.platform.b2c.trade.order.model.Order;
 import com.uas.platform.b2c.trade.order.model.OrderDetail;
 import com.uas.platform.b2c.trade.order.service.OrderService;
+import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.model.Type;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
@@ -68,9 +71,17 @@ public class B2cOrderServiceImpl implements B2cOrderService {
     @Autowired
     private BankInfoService bankInfoService;
 
+    @Autowired
+    private UserDao userDao;
+
     @Autowired
     private EnterpriseDao enterpriseDao;
 
+    /**
+     * 成功标语
+     */
+    private static final String SUCCESS = "success";
+
     @Override
     public List<B2cOrder> getAllOrder() {
         // 要获取的采购的状态
@@ -150,17 +161,28 @@ public class B2cOrderServiceImpl implements B2cOrderService {
         if (!CollectionUtils.isEmpty(mallBankInfos)) {
             bankTransfer.setJsonReceive(FastjsonUtils.toJson(mallBankInfos.get(0)));
         }
-
+        // erp部分修改当前处理人信息
+        Order order = orderDao.findByOrderid(payment.getOrderid());
+        List<User> users = userDao.findUserByUserUU(order.getBuyeruu());
+        if (!SystemSession.getUser().getEnterprise().getUu().equals(order.getBuyerenuu())){
+            throw new IllegalOperatorException("警告！订单不能确认!您无权限操作");
+        }
+        if (!CollectionUtils.isEmpty(users)){
+            users.get(0).setCurrentEnterprise(order.getBuyerenuu());
+        }
+        SystemSession.setUser(users.get(0));
         bankTransferService.save(bankTransfer, payment.getOrderid());
         return true;
     }
 
     @Override
-    public B2cOrder ensury(String orderid) {
+    public String ensury(String orderid) {
         Order order = orderDao.findByOrderid(orderid);
         if (order != null) {
             orderService.ensureOrderAccept(order.getId().toString());
+            return SUCCESS;
+        } else {
+            throw new IllegalOperatorException("警告！订单编号有误");
         }
-        return null;
     }
 }

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -1,5 +1,10 @@
 package com.uas.platform.b2c.trade.order.service.impl;
 
+import static com.uas.platform.b2c.trade.aftersale.model.AfterSaleStatus.BUYER_TO_MALL;
+import static com.uas.platform.b2c.trade.aftersale.model.AfterSaleStatus.MALL_TO_SUP;
+import static com.uas.platform.b2c.trade.aftersale.model.AfterSaleStatus.SUP_TO_MALL;
+import static com.uas.platform.b2c.trade.util.Preconditions.checkNotNull;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.api.b2c_erp.buyer.model.B2cOrder;
@@ -34,7 +39,12 @@ import com.uas.platform.b2c.logistics.dao.AddressDao;
 import com.uas.platform.b2c.logistics.dao.InvoiceFOrderDao;
 import com.uas.platform.b2c.logistics.dao.InvoiceFPurchaseDao;
 import com.uas.platform.b2c.logistics.dao.PickUpAddressDao;
-import com.uas.platform.b2c.logistics.model.*;
+import com.uas.platform.b2c.logistics.model.Address;
+import com.uas.platform.b2c.logistics.model.InvoiceFOrder;
+import com.uas.platform.b2c.logistics.model.InvoiceFOrderDetail;
+import com.uas.platform.b2c.logistics.model.InvoiceFPurchase;
+import com.uas.platform.b2c.logistics.model.InvoiceFPurchaseDetail;
+import com.uas.platform.b2c.logistics.model.PickUpAddress;
 import com.uas.platform.b2c.logistics.service.InvoiceFPurchaseService;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsHistoryDao;
@@ -59,7 +69,14 @@ import com.uas.platform.b2c.trade.order.dao.OrderDao;
 import com.uas.platform.b2c.trade.order.dao.OrderDetailDao;
 import com.uas.platform.b2c.trade.order.dao.OrderIndexDetailDao;
 import com.uas.platform.b2c.trade.order.dao.PurchaseDao;
-import com.uas.platform.b2c.trade.order.model.*;
+import com.uas.platform.b2c.trade.order.model.Order;
+import com.uas.platform.b2c.trade.order.model.OrderDetail;
+import com.uas.platform.b2c.trade.order.model.OrderIndex;
+import com.uas.platform.b2c.trade.order.model.OrderIndexDetail;
+import com.uas.platform.b2c.trade.order.model.OrderSimpleInfo;
+import com.uas.platform.b2c.trade.order.model.Purchase;
+import com.uas.platform.b2c.trade.order.model.PurchaseDetail;
+import com.uas.platform.b2c.trade.order.model.TradeProofing;
 import com.uas.platform.b2c.trade.order.service.OrderDetailService;
 import com.uas.platform.b2c.trade.order.service.OrderService;
 import com.uas.platform.b2c.trade.order.service.PurchaseService;
@@ -88,6 +105,22 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.search.model.BaseOrder;
 import com.uas.search.model.PageParams;
 import com.uas.search.model.SPage;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.BeanUtils;
@@ -101,15 +134,6 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.*;
-
-import static com.uas.platform.b2c.trade.aftersale.model.AfterSaleStatus.*;
-import static com.uas.platform.b2c.trade.util.Preconditions.checkNotNull;
-
 /**
  * 订单业务实现类
  *
@@ -2793,6 +2817,8 @@ public class OrderServiceImpl implements OrderService {
             }
         }
         order.setStatus(Status.DELETED.value(), userUU);
+        // 用户自动取消订单，将erp下载状态更新为待下载状态
+        order.setSendstatus(Status.NOT_UPLOAD.value());
         orderDao.save(order);
     }
 

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -4,7 +4,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		$rootScope.active = 'vendor_material';
 		document.title = '卖家产品库-优软商城';
 		$scope.tab = 'material';
-		$scope.standard_tab = $stateParams.standardParam ? $stateParams.standardParam : 'standard';
+		$scope.standard_tab = $stateParams.standardParam ? $stateParams.standardParam : 'unstandard';
 		$scope.choosedIds = [];
 		$scope.showTip = true;
 		$scope.resultTip = true;

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html

@@ -1503,8 +1503,8 @@
 	<div class="pro_management device">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
 				<li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp({standardParam:'unstandard'})">非标产品</a></li>
+				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
 				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
 			</ul>
@@ -1621,7 +1621,7 @@
 													<div class="blue-bg">
 														<div></div>
 														<div class="img">
-															<a><img ng-src="{{goods.editPic || 'static/img/store/common/default.png'}}" alt="img"/></a>
+															<a><img ng-src="{{goods.editPic || material.cmpImg || 'static/img/store/common/default.png'}}" alt="img"/></a>
 															<div class="edit-img">
 																<a ng-click="deleteImg(goods)" class="delete-img" title="删除" ng-if="goods.editPic"><i class="fa fa-trash"></i></a>
 																<a ng-click="editGoodsPicture(goods.editPic || 'static/img/store/common/default.png', goods)" title="修改图片"><img ng-src="static/img/icon/update-img.png" /></a>
@@ -1634,7 +1634,7 @@
 																								   ng-class="{'error' : goods.editPackagingInvalid}" ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>
 															</div>
 															<div class="input-list">
-																<span class="tit">生产日期：</span><input type="text" class="form-control" name="produceDate" ng-maxlength="11" title="生产日期" maxlength="11" placeholder="生产日期" style="width: 96px;" ng-model="goods.editProduceDate"
+																<span class="tit">生产日期：</span><input type="text" class="form-control" name="produceDate" ng-maxlength="11" title="生产日期" maxlength="11" placeholder="生产日期" style="width: 96px;" ng-model="goods.editProduceDate" ng-init="goods.editProduceDate = material.productDetail.produceDate"
 																									 ng-class="{'error' : goods.editProduceDateInvalid}"
 																									 ng-change="editProduceDateFa(goods, false)"/>
 															</div>
@@ -1652,10 +1652,10 @@
 															</div>
 															<div class="input-list">
 																<span class="tit">起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty" title="起拍"  placeholder="数量"
-																									maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" ng-model="goods.editMinBuyQty" ng-blur="setPriceMinAmount(goods, false)" ng-change="updateStartNumber(goods)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
+																									maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" ng-model="goods.editMinBuyQty" ng-init="goods.editMinBuyQty = material.productDetail.minBuyQty;updateStartNumber(goods);" ng-blur="setPriceMinAmount(goods, false)" ng-change="updateStartNumber(goods)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
 															</div>
 															<div class="input-list">
-																<span class="tit">包装数量：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="包装数量" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
+																<span class="tit">包装数量：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="包装数量" placeholder="数量" ng-model="goods.editMinPackQty" ng-init="goods.editMinPackQty= material.productDetail.minPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
 															</div>
 														</div>
 														<div class="content">
@@ -1682,7 +1682,7 @@
 															<p class="title height24">单价(￥)</p>
 															<div
 																	class="input-list" ng-repeat="price in goods.editPrices">
-																<input type="number" name="rmb" class="wid92 form-control"  placeholder="单价(￥)" ng-blur="changePrices(goods.editPrices, price.rMBPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.rMBPrice" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
+																<input type="number" name="rmb" class="wid92 form-control"  placeholder="单价(￥)" ng-blur="changePrices(goods.editPrices, price.rMBPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.rMBPrice" ng-init="price.rMBPrice = material.productDetail.price" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
 															</div>
 														</div>
 														<div class="content plusBtn">
@@ -1698,11 +1698,11 @@
 															<div class="input-list">
 																<p>
 											<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" oninput="if(value.length>2)value=value.slice(0,2)"
-														 ng-model="goods.editMinDelivery"
+														 ng-model="goods.editMinDelivery" ng-init="goods.editMinDelivery = material.productDetail.minDelivery"
 														 ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, true, goods)"
 														 ng-class="{'error' : goods.editMinDeliveryinValid}"/></span>
 																	<span style="margin-left: 4px;">–</span>
-																	<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>2)value=value.slice(0,2)" ng-model="goods.editMaxDelivery" ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)"
+																	<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>2)value=value.slice(0,2)" ng-model="goods.editMaxDelivery" ng-init="goods.editMaxDelivery = material.productDetail.maxDelivery" ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)"
 																				 ng-class="{'error' : goods.editMaxDeliveryinValid}"/></span>
 																</p>
 															</div>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_unstandard_erp.html

@@ -1503,8 +1503,8 @@
 	<div class="pro_management device">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
 				<li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp({standardParam:'unstandard'})">非标产品</a></li>
+				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
 				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
 			</ul>
@@ -1621,7 +1621,7 @@
 													<div class="blue-bg">
 														<div></div>
 														<div class="img">
-															<a><img ng-src="{{goods.editPic || 'static/img/store/common/default.png'}}" alt="img"/></a>
+															<a><img ng-src="{{goods.editPic || material.cmpImg || 'static/img/store/common/default.png'}}" alt="img"/></a>
 															<div class="edit-img">
 																<a ng-click="deleteImg(goods)" class="delete-img" title="删除" ng-if="goods.editPic"><i class="fa fa-trash"></i></a>
 																<a ng-click="editGoodsPicture(goods.editPic || 'static/img/store/common/default.png', goods)" title="修改图片"><img ng-src="static/img/icon/update-img.png" /></a>
@@ -1634,7 +1634,7 @@
 																								   ng-class="{'error' : goods.editPackagingInvalid}" ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>
 															</div>
 															<div class="input-list">
-																<span class="tit">生产日期：</span><input type="text" class="form-control" name="produceDate" ng-maxlength="11" title="生产日期" maxlength="11" placeholder="生产日期" style="width: 96px;" ng-model="goods.editProduceDate"
+																<span class="tit">生产日期：</span><input type="text" class="form-control" name="produceDate" ng-maxlength="11" title="生产日期" maxlength="11" placeholder="生产日期" style="width: 96px;" ng-model="goods.editProduceDate" ng-init="material.productDetail.produceDate"
 																									 ng-class="{'error' : goods.editProduceDateInvalid}"
 																									 ng-change="editProduceDateFa(goods, false)"/>
 															</div>
@@ -1652,10 +1652,10 @@
 															</div>
 															<div class="input-list">
 																<span class="tit">起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty" title="起拍"  placeholder="数量"
-																									maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" ng-model="goods.editMinBuyQty" ng-blur="setPriceMinAmount(goods, false)" ng-change="updateStartNumber(goods)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
+																									maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" ng-model="goods.editMinBuyQty" ng-init="goods.editMinBuyQty = material.productDetail.minBuyQty;updateStartNumber(goods);" ng-blur="setPriceMinAmount(goods, false)" ng-change="updateStartNumber(goods)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
 															</div>
 															<div class="input-list">
-																<span class="tit">包装数量：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="包装数量" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
+																<span class="tit">包装数量：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="包装数量" placeholder="数量" ng-model="goods.editMinPackQty" ng-init="goods.editMinPackQty = material.productDetail.minPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
 															</div>
 														</div>
 														<div class="content">
@@ -1682,7 +1682,7 @@
 															<p class="title height24">单价(￥)</p>
 															<div
 																	class="input-list" ng-repeat="price in goods.editPrices">
-																<input type="number" name="rmb" class="wid92 form-control"  placeholder="单价(￥)" ng-blur="changePrices(goods.editPrices, price.rMBPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.rMBPrice" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
+																<input type="number" name="rmb" class="wid92 form-control"  placeholder="单价(￥)" ng-blur="changePrices(goods.editPrices, price.rMBPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.rMBPrice" ng-init="price.rMBPrice = material.productDetail.price" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
 															</div>
 														</div>
 														<div class="content plusBtn">
@@ -1698,11 +1698,11 @@
 															<div class="input-list">
 																<p>
 											<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" oninput="if(value.length>2)value=value.slice(0,2)"
-														 ng-model="goods.editMinDelivery"
+														 ng-model="goods.editMinDelivery" ng-init="goods.editMinDelivery = material.productDetail.minDelivery"
 														 ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, true, goods)"
 														 ng-class="{'error' : goods.editMinDeliveryinValid}"/></span>
 																	<span style="margin-left: 4px;">–</span>
-																	<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>2)value=value.slice(0,2)" ng-model="goods.editMaxDelivery" ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)"
+																	<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>2)value=value.slice(0,2)" ng-model="goods.editMaxDelivery" ng-init="goods.editMaxDelivery = material.productDetail.maxDelivery" ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)"
 																				 ng-class="{'error' : goods.editMaxDeliveryinValid}"/></span>
 																</p>
 															</div>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_onSale_erp.html

@@ -512,8 +512,8 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp">标准产品</a></li>
                 <li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp">非标产品</a></li>
+                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp">标准产品</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
                 <li class="down-goods">

src/main/webapp/resources/view/vendor/forstore/erp/vendor_undercarriage_erp.html

@@ -539,8 +539,8 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material_erp">标准产品</a></li>
                 <li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp">非标产品</a></li>
+                <li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material_erp">标准产品</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
             </ul>

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1500,8 +1500,8 @@
 		</div>
 		<div class="com_tab">
 			<ul class="fl distance" style="width: 100%">
-				<li ng-class="{active : standard_tab =='standard'}" ng-click="toggleStandard('standard')" title="标准产品({{sCount}})"><a href="" class="standard">标准产品(<em class="count">{{sCount}}</em>)</a></li>
 				<li ng-class="{active : standard_tab == 'unstandard'}"  ng-click="toggleStandard('unstandard')" title="非标产品({{nCount}})"><a href="" class="standard">非标产品(<em class="count">{{nCount}}</em>)</a></li>
+				<li ng-class="{active : standard_tab =='standard'}" ng-click="toggleStandard('standard')" title="标准产品({{sCount}})"><a href="" class="standard">标准产品(<em class="count">{{sCount}}</em>)</a></li>
 			</ul>
 			<!--匹配结果导航-->
 			<div class="match-menu" ng-if="resultFrame">