Explorar el Código

复制代采订单增加默认付款方式

hejq hace 8 años
padre
commit
078e3b06ed

+ 22 - 14
src/main/java/com/uas/platform/b2b/service/impl/DeputyOrderServiceImpl.java

@@ -34,6 +34,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class DeputyOrderServiceImpl implements DeputyOrderService {
@@ -453,27 +454,34 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 
 	@Override
 	public ModelMap copyOrder(Long id) {
-		DeputyOrder oldorder = deputyOrderDao.findOne(id);
-		oldorder.setId(null);
-		oldorder.setSalecode(null);
-		oldorder.setSalepocode(null);
+        // 信扬要求默认交货方式
+        final String defaultDeliveryMethod = "供应商送货到付款采购方指定仓库";
+        // 信扬UU号
+        final Long XinYang_UU = 10044118L;
+		DeputyOrder existOrder = deputyOrderDao.findOne(id);
+        existOrder.setId(null);
+        existOrder.setSalecode(null);
+        existOrder.setSalepocode(null);
 		SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmss_sss");
-		oldorder.setCode("DC" + sdf.format(new Date()));
-		oldorder.setDate(new Date());
-		oldorder.setEntrydate(new Date());
-		oldorder.setUseruu(SystemSession.getUser().getUserUU());
-		oldorder.setEntrystatus("保存");
-		oldorder.setStatus("在录入");
-		if (!CollectionUtils.isEmpty(oldorder.getDeputyOrderItems())) {
-			for (DeputyOrderItem item : oldorder.getDeputyOrderItems()) {
+        existOrder.setCode("DC" + sdf.format(new Date()));
+        existOrder.setDate(new Date());
+        existOrder.setEntrydate(new Date());
+        existOrder.setUseruu(SystemSession.getUser().getUserUU());
+        existOrder.setEntrystatus("保存");
+        existOrder.setStatus("在录入");
+        // 代采企业为信扬时,设置默认值
+		if (Objects.equals(XinYang_UU, existOrder.getDeputyuu())) {
+            existOrder.setDeliverymethod(defaultDeliveryMethod);
+        }
+		if (!CollectionUtils.isEmpty(existOrder.getDeputyOrderItems())) {
+			for (DeputyOrderItem item : existOrder.getDeputyOrderItems()) {
 				item.setId(null);
 				item.setDeoid(null);
 				item.setDetno(null);
 				item.setDeputyOrder(null);
 			}
 		}
-		return saveDeOrder(oldorder);
-
+		return saveDeOrder(existOrder);
 	}
 
 	@Override