【模具询价作废单据】之前作废单据，使用b2b_im_id根据findOne方法查找单据并修改其有效状态，但是uas端作废b2b端未报价的单据时，该条数据中b2b_im_id为null，所以找不到对应的单据设置为已作废。修改为以erpSourceId和enuu查找单据并修改状态。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7074 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -135,4 +135,13 @@ public interface PurchaseInquiryMouldDao
 	@Query("update PurchaseInquiryMould p set p.check = :check where p.id IN (:ids)")
 	public void updateByCheck(@Param("check") short check, @Param("ids") Long[] ids);
 
+	/**
+	 * 根据enuu和erpSourceId获取单据
+	 * 
+	 * @param venduu
+	 * @param erpSourceId
+	 * @return
+	 */
+	public PurchaseInquiryMould findByEnuuAndErpSourceId(Long enuu, Long erpSourceId);
+
 }

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

@@ -22,6 +22,7 @@ import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.PurchaseInquiryMould;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseInquiryMouldService;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.ArrayUtils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -136,10 +137,13 @@ public class InquiryMouldController {
 		List<InquiryMould> inquiryMoulds = FlexJsonUtils.fromJsonArray(jsonStr, InquiryMould.class);
 		System.out.println("作废的模具询价单传到平台" + JSON.toJSONString(inquiryMoulds));
 		for (InquiryMould inquiryMould : inquiryMoulds) {
-			if (null != inquiryMould.getB2b_im_id()) {
+			// 因为存在还未报价就作废单据的情况，所以不能用b2b_im_id，而用in_id来查找单据
+			if (null != inquiryMould.getIn_id()) {
 				PurchaseInquiryMould purchaseInquiryMould = purchaseInquiryMouldService
-						.findById(inquiryMould.getB2b_im_id());
-				purchaseInquiryMouldService.onInvalid(purchaseInquiryMould);
+						.findByEnuuAndErpSourceId(SystemSession.getUser().getEnterprise().getUu(),inquiryMould.getIn_id());
+				if (null != purchaseInquiryMould) {
+					purchaseInquiryMouldService.onInvalid(purchaseInquiryMould);
+				}
 			}
 		}
 		logger.log("模具询价单", "作废模具询价单", inquiryMoulds.size());

src/main/java/com/uas/platform/b2b/service/PurchaseInquiryMouldService.java

@@ -229,4 +229,14 @@ public interface PurchaseInquiryMouldService {
 	 * @return
 	 */
 	public PurchaseInquiryMould saveHistory(PurchaseInquiryMould mould);
+
+
+	/**
+	 * 根据venduu和erpSourceId获取单据
+	 * 
+	 * @param enuu
+	 * @param in_id
+	 * @return
+	 */
+	public PurchaseInquiryMould findByEnuuAndErpSourceId(Long enuu,Long in_id);
 }

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

@@ -435,4 +435,9 @@ public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldServ
 			System.out.println("修改了是否有效状态的单据" + JSON.toJSONString(purchaseInquiryMould));
 	}
 
+	@Override
+	public PurchaseInquiryMould findByEnuuAndErpSourceId(Long enuu,Long erpSourceId) {
+		return purchaseInquiryMouldDao.findByEnuuAndErpSourceId(enuu, erpSourceId);
+	}
+
 }

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

@@ -358,7 +358,7 @@ tbody td div.text-mould {
 						<!-- <a ng-click="print(inquiryMould)" class="text-muted" title="打印"><i
 							class="fa fa-print fa-lg"></i></a> -->
 							<!-- 待报价 -->
-						<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue != 1">
+						<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue != 1 && inquiryMould.adoptStatus == null">
 							<div ng-if="inquiryMould.overdue == 0">
 								<span ng-show="!inquiryMould.$editing">
 									<a ng-click="inquiryMould.$editing=!inquiryMould.$editing">报价</a>
@@ -472,7 +472,7 @@ tbody td div.text-mould {
 											<div ng-repeat="prodReply in itemReply.prodReplies">
 												<span class="col-xs-3">{{prodReply.reply | number:6}}</span>
 											</div>
-											<span class="col-xs-12">{{itemReply.replyDate | date:"yyyy-MM-dd hh:mm"}}</span>
+											<span class="col-xs-12">{{itemReply.replyDate | date:"yyyy-MM-dd HH:mm:ss"}}</span>
 											<div class="text-muted col-xs-12">
 												{{inquiryMould.enterprise.enName}}
 											</div>
@@ -492,7 +492,7 @@ tbody td div.text-mould {
 				<td>
 				</td>
 				<td class="text-center">
-					<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue == 0 && inquiryMould.valid != 0" class="block">
+					<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue == 0 && inquiryMould.valid != 0 && inquiryMould.adoptStatus == null" class="block">
 						<span class="text-waiting">待报价</span>
 					</div>
 					<div ng-if="inquiryMould.status == 201 && inquiryMould.adoptStatus == null && inquiryMould.valid != 0" class="block">

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

@@ -155,7 +155,7 @@ tbody td .text-waiting {
 							<div class="dropdown">
 								<a href="javascript:void(0);"
 									class="dropdown-toggle text-default"
-									ng-mouseover="getHistory(inquiryMould)">上次报价<i
+									ng-mouseover="getHistory(inquiryMould)">历史报价<i
 									class="fa fa-fw fa-angle-down"></i></a>
 								<div class="dropdown-menu pane" style="width: 270px;">
 									<div class="pane-body">
@@ -166,7 +166,7 @@ tbody td .text-waiting {
 													<div ng-repeat="prodReply in itemReply.prodReplies">
 														<span class="col-xs-3">{{prodReply.reply | number:6}}</span>
 													</div>
-													<span class="col-xs-12">{{itemReply.replyDate | date:"yyyy-MM-dd hh:mm"}}</span>
+													<span class="col-xs-12">{{itemReply.replyDate | date:"yyyy-MM-dd HH:mm:ss"}}</span>
 													<div class="text-muted col-xs-12">
 														{{inquiryMould.enterprise.enName}}
 													</div>
@@ -181,7 +181,7 @@ tbody td .text-waiting {
 							</div>
 						</td>
 						<td class="text-center">
-							<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue == 0 && inquiryMould.valid != 0" class="block">
+							<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue == 0 && inquiryMould.valid != 0 && inquiryMould.adoptStatus == null" class="block">
 								<span class="text-waiting">待报价</span>
 							</div>
 							<!-- 已报价 -->
@@ -213,7 +213,7 @@ tbody td .text-waiting {
 		</div>
 	</div>
 </div>
-<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue != 1">
+<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue != 1 && inquiryMould.adoptStatus == null">
 	<div class="text-center btn-items" ng-show="!inquiryMould.$editing">
 		<button class="btn btn-success btn-items" 
 			ng-click="inquiryMould.$editing=!inquiryMould.$editing">
@@ -233,7 +233,7 @@ tbody td .text-waiting {
 			ng-click="inquiryMould.$editing=!inquiryMould.$editing;reload()">取消</button>
 	</div>
 </div>
-<div ng-if="inquiryMould.replyable && inquiryMould.status == 201 && inquiryMould.adoptstatus == null && inquiryMould.checked != 1  && inquiryMould.valid != 0" style="padding-top: 20px;">
+<div ng-if="inquiryMould.replyable && inquiryMould.status == 201 && inquiryMould.adoptStatus == null && inquiryMould.checked != 1  && inquiryMould.valid != 0" style="padding-top: 20px;">
 	<div class="text-center btn-items" ng-show="!inquiryMould.$editing">
 		<button class="btn btn-success" ng-click="inquiryMould.$editing=!inquiryMould.$editing">修改报价</button>
 	</div>