【帕诺迪】-送货单上传给买家修改

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

@@ -5,6 +5,7 @@ import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.model.SaleSendItem;
 import com.uas.platform.b2b.support.SystemSession;
+import org.springframework.util.StringUtils;
 
 /**
  * 收料通知单明细
@@ -88,8 +89,14 @@ public class AcceptNotifyDetail {
 		this.and_detno = item.getNumber();
 		this.and_inqty = item.getQty();
 		this.and_pnid = item.getNotice().getSourceId();
-		this.and_ordercode = item.getNotice().getOrderItem().getOrder().getCode();
-		this.and_orderdetno = item.getNotice().getOrderItem().getNumber();
+		PurchaseOrderItem orderItem = item.getNotice().getOrderItem();
+		if (!StringUtils.isEmpty(orderItem.getCustPurchaseCode())) {
+			this.and_ordercode = orderItem.getCustPurchaseCode();
+			this.and_orderdetno = orderItem.getCustPurchaseDetno();
+		} else {
+			this.and_ordercode = orderItem.getOrder().getCode();
+			this.and_orderdetno = orderItem.getNumber();
+		}
 		this.and_price = item.getPrice();
 		this.and_remark = item.getRemark();
 	}

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

@@ -365,7 +365,11 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			// 未收料
 			send.setVerifystatus(Constant.NO);
 			send.setCustUU(notice.getEnUU());
-			send.setCustUserUU(order.getUserUU());
+			if (!StringUtils.isEmpty(notice.getOrderItem().getCustPurchaseCode())) {
+				send.setCustUserUU(100012551L);
+			} else {
+				send.setCustUserUU(order.getUserUU());
+			}
 			send.setDate(new Date());
 			send.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 			send.setPayments(order.getPayments());