【帕诺迪】-送货提醒上传修改

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

@@ -100,4 +100,14 @@ public interface PurchaseOrderItemDao extends JpaSpecificationExecutor<PurchaseO
 	 */
     @Procedure(procedureName = "purc$reply_batch")
     public void replyByBatch(String idString, String username, String userip, Long enuu, Long useruu, Long batch_delivery);
+
+	/**
+	 * 根据客户采购订单号和序号查找明细(代采)
+	 * @param vendUU 终端供应商uu
+	 * @param custPurchaseCode 客户采购订单号
+	 * @param custPurchaseDetno 客户采购订单序号
+	 * @return
+	 */
+    @Query("from PurchaseOrderItem p where p.order.vendUU = :vendUU and p.custPurchaseCode = :custPurchaseCode and p.custPurchaseDetno = :custPurchaseDetno")
+    List<PurchaseOrderItem> findByCustpurchasecodeAndCustpurchasedetno(@Param("vendUU") Long vendUU,@Param("custPurchaseCode") String custPurchaseCode,@Param("custPurchaseDetno") Short custPurchaseDetno);
 }

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

@@ -206,12 +206,12 @@ public class PurchaseDetail {
 		item.setStatus((short) Status.NOT_REPLY.value());
 		item.setProductCode(this.pd_prodcode);
 		item.setBeipin(this.pd_beipin);
-		item.setPurcvendname(this.pd_purcvendname);
-		item.setPurcvenduu(this.pd_purcvenduu);
-		item.setCustpurchasecode(this.pd_custpurchasecode);
-		item.setCustpurchasedetno(this.pd_custpurchasedetno);
-		item.setAcceptcustname(this.pd_acceptcustname);
-		item.setAcceptcustaddress(this.pd_acceptcustaddress);
+		item.setPurcVendName(this.pd_purcvendname);
+		item.setPurcVenduu(this.pd_purcvenduu);
+		item.setCustPurchaseCode(this.pd_custpurchasecode);
+		item.setCustPurchaseDetno(this.pd_custpurchasedetno);
+		item.setAcceptCustName(this.pd_acceptcustname);
+		item.setAcceptCustAddress(this.pd_acceptcustaddress);
 		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/erp/model/PurchaseNotify.java

@@ -5,6 +5,7 @@ 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;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -65,6 +66,17 @@ public class PurchaseNotify extends KeyEntity {
 	 */
 	private Long pn_b2bid;
 
+	//终端供应商，为0表示正常送货提醒
+	private Long pn_terminalvenduu;
+
+	public Long getPn_terminalvenduu() {
+		return pn_terminalvenduu;
+	}
+
+	public void setPn_terminalvenduu(Long pn_terminalvenduu) {
+		this.pn_terminalvenduu = pn_terminalvenduu;
+	}
+
 	public long getPn_id() {
 		return pn_id;
 	}
@@ -164,10 +176,15 @@ public class PurchaseNotify extends KeyEntity {
 		notice.setDate(pn_indate);
 		notice.setDelivery(pn_delivery);
 		notice.setEndQty(pn_endqty);
-		notice.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 		notice.setQty(pn_qty);
 		notice.setRemark(pn_remark);
-		notice.setVendUU(ve_uu);
+		if ((!StringUtils.isEmpty(pn_terminalvenduu)) && (pn_terminalvenduu != 0)) {
+			notice.setVendUU(pn_terminalvenduu);
+			notice.setEnUU(10001255L);
+		} else {
+			notice.setVendUU(ve_uu);
+			notice.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+		}
 		PurchaseOrder order = new PurchaseOrder();
 		order.setCode(pn_ordercode);
 		PurchaseOrderItem orderItem = new PurchaseOrderItem();

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

@@ -258,11 +258,11 @@ public class SaleDownDetail {
 		this.sd_factory = orderItem.getFactory();
 		this.sd_prodsource = orderItem.getProdsource();
 		this.sd_remark = orderItem.getRemark();
-		this.sd_purcvendname = orderItem.getPurcvendname();
-		this.sd_purcvenduu = orderItem.getPurcvenduu();
-		this.sd_purcdetno = orderItem.getCustpurchasedetno();
-		this.sd_acceptcustname = orderItem.getAcceptcustname();
-		this.sd_acceptcustaddress = orderItem.getAcceptcustaddress();
+		this.sd_purcvendname = orderItem.getPurcVendName();
+		this.sd_purcvenduu = orderItem.getPurcVenduu();
+		this.sd_purcdetno = orderItem.getCustPurchaseDetno();
+		this.sd_acceptcustname = orderItem.getAcceptCustName();
+		this.sd_acceptcustaddress = orderItem.getAcceptCustAddress();
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseNotifyServiceImpl.java

@@ -53,12 +53,23 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 					notice.getSourceId());
 			// sourceId不存在新增保存
 			if (CollectionUtils.isEmpty(existNotices)) {
-				List<Long> idList = purchaseOrderItemDao.findIdByEnUUAndOrderCodeAndNumber(notice.getEnUU(),
-                        notice.getOrderItem().getOrder().getCode(), notice.getOrderItem().getNumber());
-				if (!CollectionUtils.isEmpty(idList)) {
-					notice.setOrderItemId(idList.get(0));
-					notice.setOrderItem(null);
-					notices.add(notice);
+				// 终端供应商uu存在
+				if(!StringUtils.isEmpty(notify.getPn_terminalvenduu()) && notify.getPn_terminalvenduu() != 0) {
+					List<PurchaseOrderItem> itemList = purchaseOrderItemDao.findByCustpurchasecodeAndCustpurchasedetno(notice.getVendUU(),notice.getOrderItem().getOrder().getCode(),
+							notice.getOrderItem().getNumber());
+					if (!CollectionUtils.isEmpty(itemList)) {
+						notice.setOrderItemId(itemList.get(0).getId());
+						notice.setOrderItem(null);
+						notices.add(notice);
+					}
+				} else {
+					List<Long> idList = purchaseOrderItemDao.findIdByEnUUAndOrderCodeAndNumber(notice.getEnUU(),
+							notice.getOrderItem().getOrder().getCode(), notice.getOrderItem().getNumber());
+					if (!CollectionUtils.isEmpty(idList)) {
+						notice.setOrderItemId(idList.get(0));
+						notice.setOrderItem(null);
+						notices.add(notice);
+					}
 				}
 				// 对现有的单据，修改
 			} else {

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

@@ -159,38 +159,37 @@ public class PurcOrderInfoItem extends AbstractOrderProduct {
 	 * 终端供应商名称
 	 */
 	@Column(name = "pd_purcvendname")
-	private String purcvendname;
+	private String purcVendName;
 
 	/**
 	 * 终端供应商uu
 	 */
 	@Column(name = "pd_purcvenduu")
-	private Long purcvenduu;
+	private Long purcVenduu;
 
 	/**
 	 * 客户采购订单号
 	 */
 	@Column(name = "pd_custpurchasecode")
-	private String custpurchasecode;
+	private String custPurchaseCode;
 
 	/**
 	 * 客户采购订单序号
 	 */
 	@Column(name = "pd_custpurchasedetno")
-	private Short custpurchasedetno;
+	private Short custPurchaseDetno;
 
 	/**
 	 * 收货客户
 	 */
 	@Column(name = "pd_acceptcustname")
-	private String acceptcustname;
+	private String acceptCustName;
 
 	/**
 	 * 收货地址
 	 */
 	@Column(name = "pd_acceptcustaddress")
-	private  String acceptcustaddress;
-
+	private  String acceptCustAddress;
 	/**
 	 * 关键词查询相关
 	 */
@@ -404,52 +403,52 @@ public class PurcOrderInfoItem extends AbstractOrderProduct {
 		this.vendspec = vendspec;
 	}
 
-	public String getPurcvendname() {
-		return purcvendname;
+	public String getPurcVendName() {
+		return purcVendName;
 	}
 
-	public void setPurcvendname(String purcvendname) {
-		this.purcvendname = purcvendname;
+	public void setPurcVendName(String purcVendName) {
+		this.purcVendName = purcVendName;
 	}
 
-	public Long getPurcvenduu() {
-		return purcvenduu;
+	public Long getPurcVenduu() {
+		return purcVenduu;
 	}
 
-	public void setPurcvenduu(Long purcvenduu) {
-		this.purcvenduu = purcvenduu;
+	public void setPurcVenduu(Long purcVenduu) {
+		this.purcVenduu = purcVenduu;
 	}
 
-	public String getCustpurchasecode() {
-		return custpurchasecode;
+	public String getCustPurchaseCode() {
+		return custPurchaseCode;
 	}
 
-	public void setCustpurchasecode(String custpurchasecode) {
-		this.custpurchasecode = custpurchasecode;
+	public void setCustPurchaseCode(String custPurchaseCode) {
+		this.custPurchaseCode = custPurchaseCode;
 	}
 
-	public Short getCustpurchasedetno() {
-		return custpurchasedetno;
+	public Short getCustPurchaseDetno() {
+		return custPurchaseDetno;
 	}
 
-	public void setCustpurchasedetno(Short custpurchasedetno) {
-		this.custpurchasedetno = custpurchasedetno;
+	public void setCustPurchaseDetno(Short custPurchaseDetno) {
+		this.custPurchaseDetno = custPurchaseDetno;
 	}
 
-	public String getAcceptcustname() {
-		return acceptcustname;
+	public String getAcceptCustName() {
+		return acceptCustName;
 	}
 
-	public void setAcceptcustname(String acceptcustname) {
-		this.acceptcustname = acceptcustname;
+	public void setAcceptCustName(String acceptCustName) {
+		this.acceptCustName = acceptCustName;
 	}
 
-	public String getAcceptcustaddress() {
-		return acceptcustaddress;
+	public String getAcceptCustAddress() {
+		return acceptCustAddress;
 	}
 
-	public void setAcceptcustaddress(String acceptcustaddress) {
-		this.acceptcustaddress = acceptcustaddress;
+	public void setAcceptCustAddress(String acceptCustAddress) {
+		this.acceptCustAddress = acceptCustAddress;
 	}
 
 	public double getBalance() {

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

@@ -178,37 +178,37 @@ public class PurchaseOrderAllItem extends AbstractOrderProduct {
 	 * 终端供应商名称
 	 */
 	@Column(name = "pd_purcvendname")
-	private String purcvendname;
+	private String purcVendName;
 
 	/**
 	 * 终端供应商uu
 	 */
 	@Column(name = "pd_purcvenduu")
-    private Long purcvenduu;
+	private Long purcVenduu;
 
 	/**
 	 * 客户采购订单号
 	 */
 	@Column(name = "pd_custpurchasecode")
-    private String custpurchasecode;
+	private String custPurchaseCode;
 
 	/**
 	 * 客户采购订单序号
 	 */
 	@Column(name = "pd_custpurchasedetno")
-    private Short custpurchasedetno;
+	private Short custPurchaseDetno;
 
 	/**
 	 * 收货客户
 	 */
 	@Column(name = "pd_acceptcustname")
-	private String acceptcustname;
+	private String acceptCustName;
 
 	/**
 	 * 收货地址
 	 */
 	@Column(name = "pd_acceptcustaddress")
-    private  String acceptcustaddress;
+	private  String acceptCustAddress;
 
 	/**
 	 * 是否在变更中
@@ -479,51 +479,51 @@ public class PurchaseOrderAllItem extends AbstractOrderProduct {
 		return orders;
 	}
 
-	public String getPurcvendname() {
-		return purcvendname;
+	public String getPurcVendName() {
+		return purcVendName;
 	}
 
-	public void setPurcvendname(String purcvendname) {
-		this.purcvendname = purcvendname;
+	public void setPurcVendName(String purcVendName) {
+		this.purcVendName = purcVendName;
 	}
 
-	public Long getPurcvenduu() {
-		return purcvenduu;
+	public Long getPurcVenduu() {
+		return purcVenduu;
 	}
 
-	public void setPurcvenduu(Long purcvenduu) {
-		this.purcvenduu = purcvenduu;
+	public void setPurcVenduu(Long purcVenduu) {
+		this.purcVenduu = purcVenduu;
 	}
 
-	public String getCustpurchasecode() {
-		return custpurchasecode;
+	public String getCustPurchaseCode() {
+		return custPurchaseCode;
 	}
 
-	public void setCustpurchasecode(String custpurchasecode) {
-		this.custpurchasecode = custpurchasecode;
+	public void setCustPurchaseCode(String custPurchaseCode) {
+		this.custPurchaseCode = custPurchaseCode;
 	}
 
-	public Short getCustpurchasedetno() {
-		return custpurchasedetno;
+	public Short getCustPurchaseDetno() {
+		return custPurchaseDetno;
 	}
 
-	public void setCustpurchasedetno(Short custpurchasedetno) {
-		this.custpurchasedetno = custpurchasedetno;
+	public void setCustPurchaseDetno(Short custPurchaseDetno) {
+		this.custPurchaseDetno = custPurchaseDetno;
 	}
 
-	public String getAcceptcustname() {
-		return acceptcustname;
+	public String getAcceptCustName() {
+		return acceptCustName;
 	}
 
-	public void setAcceptcustname(String acceptcustname) {
-		this.acceptcustname = acceptcustname;
+	public void setAcceptCustName(String acceptCustName) {
+		this.acceptCustName = acceptCustName;
 	}
 
-	public String getAcceptcustaddress() {
-		return acceptcustaddress;
+	public String getAcceptCustAddress() {
+		return acceptCustAddress;
 	}
 
-	public void setAcceptcustaddress(String acceptcustaddress) {
-		this.acceptcustaddress = acceptcustaddress;
+	public void setAcceptCustAddress(String acceptCustAddress) {
+		this.acceptCustAddress = acceptCustAddress;
 	}
 }

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

@@ -159,6 +159,42 @@ public class PurchaseOrderItem extends AbstractOrderProduct {
 	@Column(name = "pd_endstatus")
 	private Short endStatus;
 
+	/**
+	 * 终端供应商名称
+	 */
+	@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;
+
 	public Long getId() {
 		return id;
 	}
@@ -345,6 +381,54 @@ public class PurchaseOrderItem extends AbstractOrderProduct {
 		this.vendspec = vendspec;
 	}
 
+	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 static List<PurchaseOrderItem> distinctItem(List<PurchaseOrderItem> items) {
 		List<PurchaseOrderItem> orderItems = new ArrayList<>();
 		Set<Long> keys = new HashSet<>();