Merge branch 'hotfix-hejq-201808' of ssh://10.10.101.21/source/platform-b2b into dev

src/main/java/com/uas/platform/b2b/controller/SaleNoticeController.java

@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -207,7 +208,11 @@ public class SaleNoticeController {
 			}
 			pageParams.getFilters().put("pn_enuu", new MultiValue(list, true));
 		}
-		pageParams.getFilters().put("is_waiting", (short) Constant.YES);
+		pageParams.getFilters().put("is_waiting", Constant.YES);
+		// 排除已结案的数据
+		Map<String,Object> map = new HashMap<>(1);
+		map.put("pn_end", Constant.YES);
+        pageParams.setNotEqualFilters(map);
 		if (fromDate != null) {
 			pageParams.getFilters().put(SearchConstants.FROM_DATE_KEY, fromDate);
 		}

src/main/java/com/uas/platform/b2b/erp/controller/NotExistOrderController.java

@@ -73,12 +73,12 @@ public class NotExistOrderController {
     }
 
     /**
-     * 获取平台不存在的单据信息,采购单明细
+     * 获取平台不存在的单据信息,委外单
      */
     @RequestMapping(value = "/makeMain", method = RequestMethod.GET)
     public List<NotExistOrders> findNotExistMakeMain() {
         List<NotExistOrders> orders = orderService.findByEnUUAndStatusAndType(SystemSession.getUser().getEnterprise().getUu(),
-                Status.NOT_UPLOAD.value(), OrderType.saleItem.name());
+                Status.NOT_UPLOAD.value(), OrderType.makeMain.name());
         logger.log("查询未上传订单", "查询未上传委外单", orders.size());
         return orders;
     }

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

@@ -70,21 +70,21 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 					remark = existNotice.getRemark() + "； ";
 				}
 				// 对卖家传输状态 // 待上传
-				existNotice.setSendStatus((short) Status.NOT_UPLOAD.value());
+                existNotice.setSendStatus((short) Status.NOT_UPLOAD.value());
 				if (existNotice.getQty() != null && !existNotice.getQty().equals(notice.getQty())) {
 					if (existNotice.getEndQty() > notice.getQty()) {
 						// 已发货数大于新的需求数，修改平台上的需求数为已发货数，将已发货数量传回买家ERP修改发货提醒的数量
-						existNotice.setRemark(remark + dateString + "修改需求数量，" + existNotice.getQty() + " -> "
+						existNotice.setRemark(remark + dateString + "修改需求数量:" + existNotice.getQty() + " -> "
 								+ existNotice.getEndQty());
-                        // 需求数量
+						// 需求数量
 						existNotice.setQty(existNotice.getEndQty());
-                        // 状态  已回复
+						// 状态  已回复
 						existNotice.setStatus((short) Status.REPLIED.value());
 						notices.add(existNotice);
 					} else {
 						// 已发货数小于或等于新的需求数，修改平台上的需求数为新的需求数
 						existNotice.setRemark(
-								remark + dateString + "修改需求数量，" + existNotice.getQty() + " -> " + notice.getQty());
+								remark + dateString + "修改需求数量:" + existNotice.getQty() + " -> " + notice.getQty());
 						existNotice.setQty(notice.getQty());
 						existNotice.setDelivery(notice.getDelivery());
 						notices.add(existNotice);
@@ -99,7 +99,7 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 						deliveryStr = dateFormat.format(notice.getDelivery());
 					}
 					if (!existDeliveryStr.equals(deliveryStr)) {
-						existNotice.setRemark(remark + dateString + "修改交期，" + existDeliveryStr + " -> " + deliveryStr);
+						existNotice.setRemark(remark + dateString + "修改交期: " + existDeliveryStr + " -> " + deliveryStr);
                         mergeWaitingStatus(existNotice.getId(), SqlDateFormdateUtils.DATE_FORMAT.format(notice.getDelivery()));
 					}
 					existNotice.setDelivery(notice.getDelivery());

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

@@ -85,7 +85,7 @@ public class PurchaseNotice implements Serializable {
 	/**
 	 * 客户采购单明细
 	 */
-	@OneToOne(cascade = {  }, fetch = FetchType.EAGER)
+	@OneToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name = "pn_pdid", insertable = false, updatable = false)
 	private PurchaseOrderItem orderItem;