|
|
@@ -9,10 +9,7 @@ import com.uas.platform.b2b.ps.ProductUtils;
|
|
|
import com.uas.platform.b2b.service.BaseInfoService;
|
|
|
import com.uas.platform.b2b.service.PurcOrderService;
|
|
|
import com.uas.platform.b2b.support.SystemSession;
|
|
|
-import com.uas.platform.b2b.temporary.model.Customers;
|
|
|
-import com.uas.platform.b2b.temporary.model.NewPurcOrder;
|
|
|
-import com.uas.platform.b2b.temporary.model.OrderItems;
|
|
|
-import com.uas.platform.b2b.temporary.model.ProductInfo;
|
|
|
+import com.uas.platform.b2b.temporary.model.*;
|
|
|
import com.uas.platform.core.model.Constant;
|
|
|
import com.uas.platform.core.model.Status;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
@@ -268,12 +265,18 @@ public class PurcOrderServiceImpl implements PurcOrderService {
|
|
|
neworder.setVenduser(order.getVenduser());
|
|
|
neworder.setRate(order.getRate());
|
|
|
neworder.setStatus((short) Status.UNAUDIT.value());
|
|
|
- Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
|
|
|
+ Enterprise enter = enterpriseDao.findEnterpriseByUu(SystemSession.getUser().getEnterprise().getUu());
|
|
|
Customers cust = new Customers();
|
|
|
cust.setUu(enter.getUu());
|
|
|
cust.setEnName(enter.getEnName());
|
|
|
neworder.setCust(cust);
|
|
|
neworder.setVendusertel(order.getVendusertel());
|
|
|
+ VendorInfo vendorInfo = new VendorInfo();
|
|
|
+ Enterprise vend = enterpriseDao.findEnterpriseByUu(order.getVendUU());
|
|
|
+ vendorInfo.setEnAdminuu(vend.getEnAdminuu());
|
|
|
+ vendorInfo.setEnName(vend.getEnName());
|
|
|
+ vendorInfo.setUu(vend.getUu());
|
|
|
+ neworder.setVend(vendorInfo);
|
|
|
List<OrderItems> items = new ArrayList<OrderItems>();
|
|
|
if (!CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
for (PurchaseOrderAllItem orderitem : order.getOrderItems()) {
|
dongbw