Browse Source

【商务平台】 对账单检验时条件更改

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@6411 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
commit
727f4bd0e8

+ 15 - 13
src/main/java/com/uas/platform/b2b/erp/service/impl/APCheckServiceImpl.java

@@ -47,19 +47,21 @@ public class APCheckServiceImpl implements APCheckService {
 					apcheckb2b.setCheckStatus(apCheck.getAc_confirmstatus());
 					apcheckb2b.setCustreply(apCheck.getAc_reason());
 					apcheckb2b.setStatus(apCheck.getAc_status());
-					if (apCheck.getAc_code() != null && apCheck.getAc_status() == 203) {
-						if (apCheck.getAc_confirmstatus().equals("未对账")) {
-							throw new IllegalStatusException("已提交,不能重复提交");
-						} else if (apCheck.getAc_confirmstatus().equals("已确认")) {
-							for (PurchaseApCheckItem exitItem : apcheckb2b.getItems()) {
-								exitItem.setCustCheckQty(exitItem.getCheckQty());
-								exitItem.setApCheck(apcheckb2b);
-								apCheckItems.add(exitItem);
-							}
-						} else if (apCheck.getAc_confirmstatus().equals("不同意")) {
-							for (PurchaseApCheckItem exitItem : apcheckb2b.getItems()) {
-								exitItem.setApCheck(apcheckb2b);
-								apCheckItems.add(exitItem);
+					if (apCheck.getAc_code() != null) {
+						if (apcheckb2b.getStatus() == 203) {
+							if (apCheck.getAc_confirmstatus().equals("未对账")) {
+								throw new IllegalStatusException("已提交,不能重复提交");
+							} else if (apCheck.getAc_confirmstatus().equals("已确认")) {
+								for (PurchaseApCheckItem exitItem : apcheckb2b.getItems()) {
+									exitItem.setCustCheckQty(exitItem.getCheckQty());
+									exitItem.setApCheck(apcheckb2b);
+									apCheckItems.add(exitItem);
+								}
+							} else if (apCheck.getAc_confirmstatus().equals("不同意")) {
+								for (PurchaseApCheckItem exitItem : apcheckb2b.getItems()) {
+									exitItem.setApCheck(apcheckb2b);
+									apCheckItems.add(exitItem);
+								}
 							}
 						}
 					}