送货提醒新增单据字段end设置默认值0，表示未过期

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

@@ -4,6 +4,7 @@ import com.uas.platform.b2b.model.PurchaseNotice;
 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.Constant;
 import com.uas.platform.core.model.Status;
 import org.springframework.util.StringUtils;
 
@@ -23,34 +24,42 @@ public class PurchaseNotify extends KeyEntity {
 	 * 原id，erp id
 	 */
 	private long pn_id;
+
 	/**
 	 * 供应商UU号
 	 */
 	private long ve_uu;
+
 	/**
 	 * 录入日期
 	 */
 	private Date pn_indate;
+
 	/**
 	 * 需求数量
 	 */
 	private Double pn_qty;
+
 	/**
 	 * 要求发货日期
 	 */
 	private Date pn_delivery;
+
 	/**
 	 * 订单编号
 	 */
 	private String pn_ordercode;
+
 	/**
 	 * 订单明细序号
 	 */
 	private Short pn_orderdetno;
+
 	/**
 	 * 备注
 	 */
 	private String pn_remark;
+
 	/**
 	 * 已发货数量
 	 */
@@ -66,7 +75,9 @@ public class PurchaseNotify extends KeyEntity {
 	 */
 	private Long pn_b2bid;
 
-	//终端供应商，为0表示正常送货提醒
+    /**
+     *  终端供应商，为0表示正常送货提醒
+     */
 	private Long pn_terminalvenduu;
 
 	public Long getPn_terminalvenduu() {
@@ -180,11 +191,10 @@ public class PurchaseNotify extends KeyEntity {
 		notice.setRemark(pn_remark);
 		if ((!StringUtils.isEmpty(pn_terminalvenduu)) && (pn_terminalvenduu != 0)) {
 			notice.setVendUU(pn_terminalvenduu);
-			notice.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 		} else {
 			notice.setVendUU(ve_uu);
-			notice.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 		}
+        notice.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 		PurchaseOrder order = new PurchaseOrder();
 		order.setCode(pn_ordercode);
 		PurchaseOrderItem orderItem = new PurchaseOrderItem();
@@ -195,34 +205,8 @@ public class PurchaseNotify extends KeyEntity {
 		notice.setSendStatus((short) Status.NOT_UPLOAD.value());
 		notice.setMinPackQty(pr_zxbzs);
 		notice.setErpDate(new Date());
-		return notice;
-	}
-
-	/**
-	 * 转为平台的客户送货提醒（EDI）
-	 *
-	 * @return
-	 */
-	public PurchaseNotice convertEDI(Long enUU) {
-		PurchaseNotice notice = new PurchaseNotice();
-		notice.setSourceId(pn_id);
-		notice.setDate(pn_indate);
-		notice.setDelivery(pn_delivery);
-		notice.setEndQty(pn_endqty);
-		notice.setEnUU(enUU);
-		notice.setQty(pn_qty);
-		notice.setRemark(pn_remark);
-		notice.setVendUU(ve_uu);
-		PurchaseOrder order = new PurchaseOrder();
-		order.setCode(pn_ordercode);
-		PurchaseOrderItem orderItem = new PurchaseOrderItem();
-		orderItem.setNumber(pn_orderdetno);
-		orderItem.setOrder(order);
-		notice.setOrderItem(orderItem);
-		notice.setStatus((short) Status.NOT_REPLY.value());
-		notice.setSendStatus((short) Status.NOT_UPLOAD.value());
-		notice.setMinPackQty(pr_zxbzs);
-		notice.setErpDate(new Date());
+		notice.setEnd(Constant.NO);
+		notice.setWaiting(Constant.YES);
 		return notice;
 	}
 

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

@@ -10,16 +10,20 @@ import com.uas.platform.b2b.erp.model.AcceptNotifyConfirm;
 import com.uas.platform.b2b.erp.model.AcceptNotifyVerify;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.erp.service.PurchaseNotifyService;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.PurchaseNotice;
+import com.uas.platform.b2b.model.PurchaseOrderItem;
+import com.uas.platform.b2b.model.SaleSend;
+import com.uas.platform.b2b.model.SaleSendItem;
+import com.uas.platform.b2b.model.SaleSendItemVerify;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -50,13 +54,12 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 		List<PurchaseNotice> notices = new ArrayList<>();
 		for (PurchaseNotify notify : notifies) {
 			PurchaseNotice notice = notify.convert();
-			List<PurchaseNotice> existNotices = purchaseNoticeDao.findByEnUUAndSourceId(notice.getEnUU(),
-					notice.getSourceId());
+			List<PurchaseNotice> existNotices = purchaseNoticeDao.findByEnUUAndSourceId(notice.getEnUU(), notice.getSourceId());
 			// sourceId不存在新增保存
 			if (CollectionUtils.isEmpty(existNotices)) {
 				// 终端供应商uu存在
-				if(!StringUtils.isEmpty(notify.getPn_terminalvenduu()) && notify.getPn_terminalvenduu() != 0) {
-					List<PurchaseOrderItem> itemList = purchaseOrderItemDao.findByCustpurchasecodeAndCustpurchasedetno(notice.getVendUU(),notice.getOrderItem().getOrder().getCode(),
+				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());
@@ -75,7 +78,7 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 				// 对现有的单据，修改
 			} else {
 				PurchaseNotice existNotice = existNotices.get(0);
-				SimpleDateFormat dateFormat = new SimpleDateFormat("MM月dd日");
+				FastDateFormat dateFormat = FastDateFormat.getInstance("MM月dd日");
 				String dateString = dateFormat.format(new Date());
 				String remark = "";
 				if (StringUtils.hasText(existNotice.getRemark())) {
@@ -95,8 +98,7 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
                         notices.add(existNotice);
                     } else {
                         // 已发货数小于或等于新的需求数，修改平台上的需求数为新的需求数
-                        existNotice.setRemark(
-                                remark + dateString + "修改需求数量，" + existNotice.getQty() + " -> " + notice.getQty());
+                        existNotice.setRemark(remark + dateString + "修改需求数量，" + existNotice.getQty() + " -> " + notice.getQty());
                         existNotice.setQty(notice.getQty());
                         existNotice.setDelivery(notice.getDelivery());
                         notices.add(existNotice);