Merge remote-tracking branch 'origin/release-test-0822' into dev

src/main/java/com/uas/platform/b2b/dao/PurcOrderInfoItemDao.java

@@ -20,8 +20,8 @@ public interface PurcOrderInfoItemDao
 	 * 根据采购客户uu和可发货下载状态查找
 	 * @return
 	 */
-	@Query("from PurcOrderInfoItem p where p.acceptCustuu = :acceptCustuu and p.issuedStatus = :issuedStatus")
-	List<PurcOrderInfoItem> findByAcceptCustuuAndIssuedStatus(@Param("acceptCustuu") long acceptCustuu,@Param("issuedStatus") short issuedStatus);
+	@Query("from PurcOrderInfoItem p where p.acceptCustuu = :acceptCustuu and p.issuedStatus <> 203")
+	List<PurcOrderInfoItem> findByAcceptCustuuAndIssuedStatus(@Param("acceptCustuu") long acceptCustuu);
 
 	/**
 	 * 更新状态

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

@@ -235,10 +235,7 @@ public class PurchaseDetail {
 		item.setAcceptCustName(this.pd_acceptcustname);
 		item.setAcceptCustAddress(this.pd_acceptcustaddress);
 		item.setAcceptCustuu(this.pd_acceptcustuu);
-		item.setHasIssued(this.pd_hasissued);
-		if (!StringUtils.isEmpty(pd_hasissued)) {
-			item.setIssuedStatus((short)Status.NOT_UPLOAD.value());
-		}
+		item.setIssuedStatus((short)Status.NOT_UPLOAD.value());
 		if (!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) {

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

@@ -198,13 +198,7 @@ public class PurcOrderInfoItem extends AbstractOrderProduct {
 	private Long acceptCustuu;
 
 	/**
-	 * 是否能发货
-	 */
-	@Column(name = "pd_hasissued")
-	private String hasIssued;
-
-	/**
-	 * hasIssued下载到代采买家状态
+	 * erp可发货状态下载到erp状态(代采)
 	 */
 	@Column(name = "pd_issuedstatus")
 	private Short issuedStatus;
@@ -478,14 +472,6 @@ public class PurcOrderInfoItem extends AbstractOrderProduct {
 		this.acceptCustuu = acceptCustuu;
 	}
 
-	public String getHasIssued() {
-		return hasIssued;
-	}
-
-	public void setHasIssued(String hasIssued) {
-		this.hasIssued = hasIssued;
-	}
-
 	public Short getIssuedStatus() {
 		return issuedStatus;
 	}

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

@@ -153,6 +153,42 @@ public class PurchaseOrderDoneItem extends AbstractOrderProduct {
 	@Transient
 	private Boolean key;
 
+	/**
+	 * 终端供应商名称
+	 */
+	@Column(name = "pd_purcvendname")
+	private String purcVendName;
+
+	/**
+	 * 终端供应商uu
+	 */
+	@Column(name = "pd_purcvenduu")
+	private Long purcVenduu;
+
+	/**
+	 * 客户采购订单号
+	 */
+	@Column(name = "pd_custpurchasecode")
+	private String custPurchaseCode;
+
+	/**
+	 * 客户采购订单序号
+	 */
+	@Column(name = "pd_custpurchasedetno")
+	private Short custPurchaseDetno;
+
+	/**
+	 * 收货客户
+	 */
+	@Column(name = "pd_acceptcustname")
+	private String acceptCustName;
+
+	/**
+	 * 收货地址
+	 */
+	@Column(name = "pd_acceptcustaddress")
+	private  String acceptCustAddress;
+
 	/**
 	 * 最后一次回复数量
 	 */
@@ -334,4 +370,52 @@ public class PurchaseOrderDoneItem extends AbstractOrderProduct {
     public void setLatestReplyQty(Double latestReplyQty) {
         this.latestReplyQty = latestReplyQty;
     }
+
+	public String getPurcVendName() {
+		return purcVendName;
+	}
+
+	public void setPurcVendName(String purcVendName) {
+		this.purcVendName = purcVendName;
+	}
+
+	public Long getPurcVenduu() {
+		return purcVenduu;
+	}
+
+	public void setPurcVenduu(Long purcVenduu) {
+		this.purcVenduu = purcVenduu;
+	}
+
+	public String getCustPurchaseCode() {
+		return custPurchaseCode;
+	}
+
+	public void setCustPurchaseCode(String custPurchaseCode) {
+		this.custPurchaseCode = custPurchaseCode;
+	}
+
+	public Short getCustPurchaseDetno() {
+		return custPurchaseDetno;
+	}
+
+	public void setCustPurchaseDetno(Short custPurchaseDetno) {
+		this.custPurchaseDetno = custPurchaseDetno;
+	}
+
+	public String getAcceptCustName() {
+		return acceptCustName;
+	}
+
+	public void setAcceptCustName(String acceptCustName) {
+		this.acceptCustName = acceptCustName;
+	}
+
+	public String getAcceptCustAddress() {
+		return acceptCustAddress;
+	}
+
+	public void setAcceptCustAddress(String acceptCustAddress) {
+		this.acceptCustAddress = acceptCustAddress;
+	}
 }

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

@@ -143,12 +143,96 @@ public class PurchaseOrderTodoItem extends AbstractOrderProduct {
 	@Transient
 	private Boolean key;
 
+	/**
+	 * 终端供应商名称
+	 */
+	@Column(name = "pd_purcvendname")
+	private String purcVendName;
+
+	/**
+	 * 终端供应商uu
+	 */
+	@Column(name = "pd_purcvenduu")
+	private Long purcVenduu;
+
+	/**
+	 * 客户采购订单号
+	 */
+	@Column(name = "pd_custpurchasecode")
+	private String custPurchaseCode;
+
+	/**
+	 * 客户采购订单序号
+	 */
+	@Column(name = "pd_custpurchasedetno")
+	private Short custPurchaseDetno;
+
+	/**
+	 * 收货客户
+	 */
+	@Column(name = "pd_acceptcustname")
+	private String acceptCustName;
+
+	/**
+	 * 收货地址
+	 */
+	@Column(name = "pd_acceptcustaddress")
+	private  String acceptCustAddress;
+
     /**
      * 最后一次回复数量
      */
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPurcVendName() {
+		return purcVendName;
+	}
+
+	public void setPurcVendName(String purcVendName) {
+		this.purcVendName = purcVendName;
+	}
+
+	public Long getPurcVenduu() {
+		return purcVenduu;
+	}
+
+	public void setPurcVenduu(Long purcVenduu) {
+		this.purcVenduu = purcVenduu;
+	}
+
+	public String getCustPurchaseCode() {
+		return custPurchaseCode;
+	}
+
+	public void setCustPurchaseCode(String custPurchaseCode) {
+		this.custPurchaseCode = custPurchaseCode;
+	}
+
+	public Short getCustPurchaseDetno() {
+		return custPurchaseDetno;
+	}
+
+	public void setCustPurchaseDetno(Short custPurchaseDetno) {
+		this.custPurchaseDetno = custPurchaseDetno;
+	}
+
+	public String getAcceptCustName() {
+		return acceptCustName;
+	}
+
+	public void setAcceptCustName(String acceptCustName) {
+		this.acceptCustName = acceptCustName;
+	}
+
+	public String getAcceptCustAddress() {
+		return acceptCustAddress;
+	}
+
+	public void setAcceptCustAddress(String acceptCustAddress) {
+		this.acceptCustAddress = acceptCustAddress;
+	}
+
 	public Long getId() {
 		return id;
 	}

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

@@ -152,6 +152,42 @@ public class PurchaseOrderWaitingItem extends AbstractOrderProduct {
 	@Column(name = "pd_returnqty")
 	private Double returnQty;
 
+	/**
+	 * 终端供应商名称
+	 */
+	@Column(name = "pd_purcvendname")
+	private String purcVendName;
+
+	/**
+	 * 终端供应商uu
+	 */
+	@Column(name = "pd_purcvenduu")
+	private Long purcVenduu;
+
+	/**
+	 * 客户采购订单号
+	 */
+	@Column(name = "pd_custpurchasecode")
+	private String custPurchaseCode;
+
+	/**
+	 * 客户采购订单序号
+	 */
+	@Column(name = "pd_custpurchasedetno")
+	private Short custPurchaseDetno;
+
+	/**
+	 * 收货客户
+	 */
+	@Column(name = "pd_acceptcustname")
+	private String acceptCustName;
+
+	/**
+	 * 收货地址
+	 */
+	@Column(name = "pd_acceptcustaddress")
+	private  String acceptCustAddress;
+
 	/**
 	 * 关键词查询相关
 	 */
@@ -359,4 +395,52 @@ public class PurchaseOrderWaitingItem extends AbstractOrderProduct {
     public void setLatestReplyQty(Double latestReplyQty) {
         this.latestReplyQty = latestReplyQty;
     }
+
+	public String getPurcVendName() {
+		return purcVendName;
+	}
+
+	public void setPurcVendName(String purcVendName) {
+		this.purcVendName = purcVendName;
+	}
+
+	public Long getPurcVenduu() {
+		return purcVenduu;
+	}
+
+	public void setPurcVenduu(Long purcVenduu) {
+		this.purcVenduu = purcVenduu;
+	}
+
+	public String getCustPurchaseCode() {
+		return custPurchaseCode;
+	}
+
+	public void setCustPurchaseCode(String custPurchaseCode) {
+		this.custPurchaseCode = custPurchaseCode;
+	}
+
+	public Short getCustPurchaseDetno() {
+		return custPurchaseDetno;
+	}
+
+	public void setCustPurchaseDetno(Short custPurchaseDetno) {
+		this.custPurchaseDetno = custPurchaseDetno;
+	}
+
+	public String getAcceptCustName() {
+		return acceptCustName;
+	}
+
+	public void setAcceptCustName(String acceptCustName) {
+		this.acceptCustName = acceptCustName;
+	}
+
+	public String getAcceptCustAddress() {
+		return acceptCustAddress;
+	}
+
+	public void setAcceptCustAddress(String acceptCustAddress) {
+		this.acceptCustAddress = acceptCustAddress;
+	}
 }

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

@@ -404,8 +404,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public List<PurcOrderInfoItem> findNotUploadIssued() {
-		return purcOrderInfoItemDao.findByAcceptCustuuAndIssuedStatus(SystemSession.getUser().getEnterprise().getUu(),
-				(short) Status.NOT_UPLOAD.value());
+		return purcOrderInfoItemDao.findByAcceptCustuuAndIssuedStatus(SystemSession.getUser().getEnterprise().getUu());
 	}
 
 	@Override

src/main/resources/test/account.properties

@@ -1,8 +1,8 @@
 ### account center config, 
-account.us.save.url=http://192.168.253.6:32323/api/userspace
-account.user.save.url=http://192.168.253.6:32323/api/user
-account.user.getPartners.url = http://192.168.253.6:32323/api/partners
-account.user.getContactPage.url=http://192.168.253.6:32323/business/groups
+account.us.save.url=http://218.17.158.219:32323/api/userspace
+account.user.save.url=http://218.17.158.219:32323/api/user
+account.user.getPartners.url = http://218.17.158.219:32323/api/partners
+account.user.getContactPage.url=http://218.17.158.219:32323/business/groups
 
 ### sso config
 sso.app=b2b
@@ -10,15 +10,15 @@ sso.app=b2b
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.cookie.browser=false
-sso.login.url=http://192.168.253.6:32323/
-sso.logout.url=http://192.168.253.6:32323/logquit
+sso.login.url=http://218.17.158.219:32323/
+sso.logout.url=http://218.17.158.219:32323/logquit
 
 #cross domain
-sso.ask.url=http://192.168.253.6:32323/sso/login/ask
-sso.askout.url=http://192.168.253.6:32323/sso/logout/ask
-sso.updatePassword.url=http://192.168.253.6:32323/reset/forgetPasswordValidationAccount
-sso.cloudcenter.url=http://192.168.253.6:32323/cloudcenter
-mall.login.url=http://192.168.253.12:23400/newLogin/other
+sso.ask.url=http://218.17.158.219:32323/sso/login/ask
+sso.askout.url=http://218.17.158.219:32323/sso/logout/ask
+sso.updatePassword.url=http://218.17.158.219:32323/reset/forgetPasswordValidationAccount
+sso.cloudcenter.url=http://218.17.158.219:32323/cloudcenter
+mall.login.url=http://218.17.158.219:23400/newLogin/other
 sso.proxy.uri=login/proxy
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=

src/main/webapp/resources/tpl/index/sale/notice.html

@@ -412,6 +412,10 @@
                      ng-bind="::notice.orderItem.product.spec"></div>
                 <div class="text-bold text-inverse" ng-if="notice.orderItem.factory">送货工厂：<span
                         ng-bind="::notice.orderItem.factory"></span></div>
+                <div class="text-bold text-inverse" ng-if="notice.orderItem.custPurchaseCode">客户采购单号：<span
+                        ng-bind="::notice.orderItem.custPurchaseCode"></span></div>
+                <div class="text-bold text-inverse" ng-if="notice.orderItem.acceptCustName">收货客户：<span
+                        ng-bind="::notice.orderItem.acceptCustName"></span></div>
             </td>
             <td class="text-center">
                 <div ng-show="!notice.$editing">{{notice.remark}}</div>

src/main/webapp/resources/tpl/index/sale/order.html

@@ -465,6 +465,9 @@
 				<div class="text-muted text-over"
 					 title="{{::item.product.spec}}"
 					ng-bind="::item.product.spec"></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.custPurchaseCode" ><b>客户采购单号：</b><div ng-bind="::item.custPurchaseCode"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustName" ><b>收货客户：</b><div ng-bind="::item.acceptCustName"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustAddress" ><b>客户收货地址：</b><div ng-bind="::item.acceptCustAddress"></div></div>
 				<div class="text-muted text-bold text-overflow" ng-if="item.vendspec" title="{{item.vendspec}}"><span ng-bind="::item.vendspec"></span></div>
 				<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂：</b><span ng-bind="::item.factory"></span></div>
 				<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注：</b><span ng-bind="::item.remark"></span></div>

src/main/webapp/resources/tpl/index/sale/send.html

@@ -287,6 +287,8 @@
 				<div class="text-muted" title="{{::item.orderItem.product.spec}}"
 					 ng-bind="::item.orderItem.product.spec"></div>
 				<div class="text-bold text-inverse" ng-if="item.orderItem.factory">送货工厂：<span ng-bind="::item.orderItem.factory"></span></div>
+				<div class="text-bold text-inverse" ng-if="item.orderItem.custPurchaseCode">客户采购单号：<span ng-bind="::item.orderItem.custPurchaseCode"></span></div>
+				<div class="text-bold text-inverse" ng-if="item.orderItem.acceptCustName">收货客户名称：<span ng-bind="::item.orderItem.acceptCustName"></span></div>
 			</td>
 			<td class="text-center br-l">
 				<span class="text-muted" ng-bind="::item.orderItem.product.unit"></span>