Просмотр исходного кода

委外验收单验退单上传增加委外单的验证

hejq 7 лет назад
Родитель
Сommit
f753079a43

+ 12 - 15
src/main/java/com/uas/platform/b2b/erp/service/impl/MakeProdInOutServiceImpl.java

@@ -1,27 +1,22 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.MakeAcceptDao;
 import com.uas.platform.b2b.dao.MakeOrderDao;
 import com.uas.platform.b2b.dao.MakeReturnDao;
 import com.uas.platform.b2b.erp.model.MakeProdInOut;
 import com.uas.platform.b2b.erp.service.MakeProdInOutService;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.MakeAccept;
-import com.uas.platform.b2b.model.MakeAcceptItem;
-import com.uas.platform.b2b.model.MakeOrder;
-import com.uas.platform.b2b.model.MakeReturn;
-import com.uas.platform.b2b.model.MakeReturnItem;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.exception.NotFoundException;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
 
 @Service
 public class MakeProdInOutServiceImpl implements MakeProdInOutService {
@@ -64,6 +59,7 @@ public class MakeProdInOutServiceImpl implements MakeProdInOutService {
 						acceptItems.add(item);
 					} else {
 						it.remove();
+                        throw new NotFoundException(item.getOrder().getCode() + "对应的委外单不存在");
 					}
 				}
 			}
@@ -107,6 +103,7 @@ public class MakeProdInOutServiceImpl implements MakeProdInOutService {
 						returnItems.add(returnItem);
 					} else {
 						it.remove();
+						throw new NotFoundException(returnItem.getOrder().getCode() + "对应的委外单不存在");
 					}
 				}
 			}