MRB单显示附件；供应商联系人保存方法修改。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8891 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/erp/model/PurchaseQuaMRB.java

@@ -1,21 +1,15 @@
 package com.uas.platform.b2b.erp.model;
 
+import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Status;
+import org.springframework.util.CollectionUtils;
+
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.model.PurchaseBadIn;
-import com.uas.platform.b2b.model.PurchaseMRB;
-import com.uas.platform.b2b.model.PurchaseMRBCheckItem;
-import com.uas.platform.b2b.model.PurchaseMRBProjectItem;
-import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.b2b.model.PurchaseOrderItem;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.Status;
-
 /**
  * 买方MRB
  * 
@@ -39,6 +33,8 @@ public class PurchaseQuaMRB {
 	private String mr_result;// 检验结果
 	private String mr_remark;// 备注
 	private String mr_shcode;// 收货单号
+	private String mr_attach;// 附件
+	private List<Attach> attaches;// 附件
 	private List<PurchaseQuaMRBCheckItem> checkItems;// 检验明细行
 	private List<PurchaseQuaMRBProjectItem> projectItems;// 项目明细行
 
@@ -178,6 +174,22 @@ public class PurchaseQuaMRB {
 		this.mr_vecode = mr_vecode;
 	}
 
+	public String getMr_attach() {
+		return mr_attach;
+	}
+
+	public void setMr_attach(String mr_attach) {
+		this.mr_attach = mr_attach;
+	}
+
+	public List<Attach> getAttaches() {
+		return attaches;
+	}
+
+	public void setAttaches(List<Attach> attaches) {
+		this.attaches = attaches;
+	}
+
 	public PurchaseMRB convent() {
 		PurchaseMRB purchaseMRB = new PurchaseMRB();
 		purchaseMRB.setCheckQty(mr_checkqty);
@@ -216,6 +228,14 @@ public class PurchaseQuaMRB {
 			}
 			purchaseMRB.setProjectItems(projectItems);
 		}
+		if(!org.apache.commons.collections.CollectionUtils.isEmpty(this.attaches)) {
+			Set<com.uas.platform.b2b.model.Attach> b2bAttaches = new HashSet<com.uas.platform.b2b.model.Attach>();
+			for(Attach attach : this.attaches) {
+				com.uas.platform.b2b.model.Attach b2bAttach = attach.convertToB2bAttach("买家MRB单附件");
+				b2bAttaches.add(b2bAttach);
+			}
+			purchaseMRB.setAttaches(b2bAttaches);
+		}
 		purchaseMRB.setErpId(this.mr_id);
 		return purchaseMRB;
 

src/main/java/com/uas/platform/b2b/model/PurchaseMRB.java

@@ -1,23 +1,10 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 买家MRB单
  * 
@@ -167,6 +154,13 @@ public class PurchaseMRB implements Serializable {
 	@Column(name = "pmji_erpid")
 	private Long erpId;
 
+	/**
+	 * 附件
+	 */
+	@OneToMany(cascade = {CascadeType.ALL}, fetch = FetchType.EAGER)
+	@JoinTable(name="purc$MRBattach", joinColumns = @JoinColumn(name = "pm_id", referencedColumnName = "pm_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
+	private Set<Attach> attaches;
+
 	public Long getId() {
 		return id;
 	}
@@ -343,4 +337,11 @@ public class PurchaseMRB implements Serializable {
 		this.erpId = erpId;
 	}
 
+	public Set<Attach> getAttaches() {
+		return attaches;
+	}
+
+	public void setAttaches(Set<Attach> attaches) {
+		this.attaches = attaches;
+	}
 }

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

@@ -1,20 +1,5 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
 import com.uas.platform.b2b.dao.DistributeDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.VendorContactDao;
@@ -27,6 +12,19 @@ import com.uas.platform.b2b.service.VendorService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class VendorsServiceImpl implements VendorService {
@@ -152,12 +150,12 @@ public class VendorsServiceImpl implements VendorService {
 			VendorContact ve = vendorContactDao.findOne(vendor.getId());
 			ve.setDate(new Date());
 			ve.setEmail(vendor.getEmail());
-			ve.setMyenuu(SystemSession.getUser().getEnterprise().getUu());
+			ve.setMyenuu(vendor.getMyenuu());
 			ve.setPhone(vendor.getPhone());
 			ve.setPosition(vendor.getPosition());
 			ve.setSex(vendor.getSex());
 			ve.setTel(vendor.getTel());
-			ve.setUseruu(SystemSession.getUser().getEnterprise().getUu());
+			ve.setUseruu(SystemSession.getUser().getUserUU());
 			ve.setVenduser(vendor.getVenduser());
 			ve.setVenduu(vendor.getVenduu());
 			vendorContact = vendorContactDao.save(ve);

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

@@ -1816,8 +1816,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				}
 			});
 			modalInstance.result.then(function(data) {
-				$scope.contact = data;
-				Vendor.saveContact({}, $scope.contact, function(data) {
+				Vendor.saveContact({}, data, function(data) {
+                    loadData();
 					toaster.pop('success', '提示', '联系人修改成功');
 				}, function(response) {
 					toaster.pop('error', '失败', response.data);
@@ -8554,6 +8554,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					$scope.checking = false;
 					$scope.checkSuccess = false;
 					$scope.checkFailed = false;
+                    $modalInstance.close();
 				}, function(response){
 					toaster.pop('error', '错误', response.data);
 				});
@@ -11061,8 +11062,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				}
 			});
 			modalInstance.result.then(function(data) {
-				$scope.contact = data;
-				Vendor.saveContact({}, $scope.contact, function(data) {
+				Vendor.saveContact({}, data, function(data) {
+				    loadData();
 					toaster.pop('success', '提示', '联系人修改成功');
 				}, function(response) {
 					toaster.pop('error', '失败', response.data);
@@ -11142,30 +11143,29 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			window.location.hash = "#/purc/purcinquiry/" + businessCode;
 		}
 	}]);
-	
+
 	/**
 	 * 编辑供应商联系人
 	 */
 	app.controller('EditContacCtrl', ['$scope', 'toaster', '$modalInstance', 'contact', function($scope, toaster, $modalInstance, contact) {
-		
-		$scope.contact = contact;
-		
+		$scope.contact = angular.copy(contact);
+
 		$scope.save = function(contact) {
 			$modalInstance.close(contact);
-		}
-		
+		};
+
 		$scope.cancel = function() {
-			$modalInstance.dismiss();
-		}
+            $modalInstance.dismiss();
+        }
 	}]);
-	
+
 	/**
 	 * 新增供应商联系人
 	 */
 	app.controller('AddContacCtrl', ['$scope', 'toaster', '$modalInstance', function($scope, toaster, $modalInstance) {
 		$scope.save = function(contact) {
 			$modalInstance.close(contact);
-		}
+		};
 		
 		$scope.cancel = function() {
 			$modalInstance.dismiss();

src/main/webapp/resources/tpl/index/account/user.html

@@ -219,7 +219,7 @@
 				</div>
         	</div>
         	<div class="modal-footer">
-            	<button class="btn btn-primary" ng-disabled="!checkSuccess" type="submit">确认修改</button>
+            	<button class="btn btn-primary" ng-disabled="!checkSuccess" type="submit">确认</button>
             	<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
         	</div>
 		</form>

src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -307,7 +307,7 @@
 				</div>
         	</div>
         	<div class="modal-footer">
-            	<button class="btn btn-primary" ng-disabled="!checkSuccess" type="submit">确认修改</button>
+            	<button class="btn btn-primary" ng-disabled="!checkSuccess" type="submit">确认</button>
             	<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
         	</div>
 		</form>

src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -236,7 +236,7 @@
 				ng-bind="::bill.enterprise.enName"></span></td>
 			<td colspan="1" class="order-sum text-num">
 				<span title="票据总额">
-					<span ng-bind="::currency(bill.currency)"></span>
+					<span ng-bind="::bill.currency"></span>
 					<span ng-bind="::bill.apAmount"></span>
 				</span>
 			</td>
@@ -261,7 +261,7 @@
 			</td>
 			<td class="text-center">
 				<div class="text-num" title="{{::item.price}}">
-					<span ng-bind="::currency(bill.currency)"></span>
+					<span ng-bind="::bill.currency"></span>
 					<span ng-bind="::item.price"></span>
 				</div>
 				<div>&nbsp;</div>
@@ -276,13 +276,13 @@
 			</td>
 			<td class="text-center br-l">
 				<div class="text-num text-bold">
-					<span ng-bind="::currency(bill.currency)"></span>
+					<span ng-bind="::bill.currency"></span>
 					<span ng-bind="::item.apAmount"></span>
 				</div>
 				<div>&nbsp;</div>
 				<div class="text-muted">
 					税金：
-					<span class="text-num" ng-bind="::currency(bill.currency)"></span>
+					<span class="text-num" ng-bind="::bill.currency"></span>
 					<span class="text-num" ng-bind="::item.taxAmount"></span>
 				</div>
 			</td>
@@ -294,7 +294,7 @@
 				</span><span class="text-muted" ng-bind="::item.product.unit"></span>
 				</div>
 				<div class="text-muted">单据金额：
-					<span class="text-num" ng-bind="::currency(bill.currency)"></span>
+					<span class="text-num" ng-bind="::bill.currency"></span>
 					<span class="text-num" ng-bind="::item.amount"></span>
 				</div>
 			</td>

src/main/webapp/resources/tpl/index/purc/modal/contact_person_modal.html

@@ -50,7 +50,7 @@
 				<li><em>姓名</em><input type="text" placeholder="姓名" ng-model="contact.venduser" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/"><span class="red">*必填</span></li>
 				<li>
 					<em>性别</em>
-					<select name="" id="" ng-model="contact.sex" ng-init="contact.sex = 'M'">
+					<select name="" id="" ng-model="contact.sex" ng-init="contact.sex ? contact.sex :'M'">
 						<option value="M">男</option>
 						<option value="F">女</option>
 					</select>

src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -189,7 +189,14 @@
 					<span ng-bind="::MRB.orderItem.product.title"></span>
 				</div>
 				<div class="text-muted" title="{{::MRB.orderItem.product.spec}}"
-					ng-bind="::MRB.orderItem.product.spec"></div>
+					ng-bind="::MRB.orderItem.product.spec">
+
+				</div>
+				<div ng-if="::MRB.attaches.length > 0">
+					<div ng-repeat="attach in MRB.attaches">
+						<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>附件：<a class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>
+					</div>
+				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -217,7 +217,7 @@
 					ng-bind="::item.batchCode"></div>
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号：<a ui-sref="sale.order_detail({id:item.orderItem.order.id})" ng-bind="::item.orderItem.order.code"></a></div>
+				<div>单据编号：<a style="color: #5078cb;" title="查看对应采购单详情"  ui-sref="sale.order_detail({id:item.orderItem.order.id})" ng-bind="::item.orderItem.order.code"></a></div>
 				<div>
 					第 <span ng-bind="::item.orderItem.number"></span> 行
 					&nbsp;&nbsp;&nbsp;&nbsp;数量：<span ng-bind="::item.orderItem.qty"></span>

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -214,7 +214,7 @@
 					ng-bind="::item.batchCode"></div>
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号：<a ui-sref="sale.order_detail({id:item.orderItem.order.id})" ng-bind="::item.orderItem.order.code"></a></div>
+				<div>单据编号：<a style="color: #5078cb;" title="查看对应采购单详情" ui-sref="sale.order_detail({id:item.orderItem.order.id})" ng-bind="::item.orderItem.order.code"></a></div>
 				<div>
 					第 <span ng-bind="::item.orderItem.number"></span> 行
 					&nbsp;&nbsp;&nbsp;&nbsp;数量：<span ng-bind="::item.orderItem.qty"></span>