Hu Jie пре 7 година
родитељ
комит
be349a130a

+ 29 - 0
src/main/java/com/uas/platform/b2b/event/SaleSendAgentEvent.java

@@ -0,0 +1,29 @@
+package com.uas.platform.b2b.event;
+
+import com.uas.platform.b2b.model.PurchaseNotice;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 送货单
+ *  @Author: huj
+ * @Date: Created in 16:33 2018/12/10.
+ */
+public class SaleSendAgentEvent extends ApplicationEvent {
+
+    private static final long serialVersionUID = -1432010236692387070L;
+
+    private PurchaseNotice notice;
+
+    public SaleSendAgentEvent(PurchaseNotice notice) {
+        super(notice);
+        this.notice = notice;
+    }
+
+    public PurchaseNotice getNotice() {
+        return notice;
+    }
+
+    public void setNotice(PurchaseNotice notice) {
+        this.notice = notice;
+    }
+}

+ 27 - 0
src/main/java/com/uas/platform/b2b/event/SaleSendAgentListener.java

@@ -0,0 +1,27 @@
+package com.uas.platform.b2b.event;
+
+import com.uas.platform.b2b.model.PurchaseNotice;
+import org.apache.log4j.Logger;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author: huj
+ * @Date: Created in 17:29 2018/12/10.
+ */
+@Component
+public class SaleSendAgentListener implements ApplicationListener<SaleSendAgentEvent> {
+
+    private final static Logger LOGGER = Logger.getLogger(SaleSendAgentListener.class);
+
+    /**
+     * Handle an application event.
+     *
+     * @param event the event to respond to
+     */
+    @Override
+    public void onApplicationEvent(SaleSendAgentEvent event) {
+        PurchaseNotice notice = event.getNotice();
+        // do something
+    }
+}

+ 15 - 0
src/main/java/com/uas/platform/b2b/service/impl/PurchaseNoticeServiceImpl.java

@@ -15,6 +15,7 @@ import com.uas.platform.b2b.dao.SaleSendItemDao;
 import com.uas.platform.b2b.dao.SaleSendItemVerifyDao;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.event.SaleSendAcceptReleaseEvent;
+import com.uas.platform.b2b.event.SaleSendAgentEvent;
 import com.uas.platform.b2b.model.B2bCodeSet;
 import com.uas.platform.b2b.model.BarLabelPrintSetting;
 import com.uas.platform.b2b.model.BarPackage;
@@ -362,6 +363,13 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			// 未收料
 			send.setVerifystatus(Constant.NO);
 			send.setCustUU(notice.getEnUU());
+			/*
+			if (!StringUtils.isEmpty(notice.getOrderItem().getCustPurchaseCode())) {
+				send.setCustUserUU(enterpriseDao.findOne(notice.getEnUU()).getEnAdminuu());
+			} else {
+				send.setCustUserUU(order.getUserUU());
+			}
+			 */
 			send.setCustUserUU(order.getUserUU());
 			send.setDate(new Date());
 			send.setEnUU(SystemSession.getUser().getEnterprise().getUu());
@@ -389,6 +397,13 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			}
 			// 我的产品库更新
             personalProductService.covertPersonalProduct(notice.getOrderItem().getProductId(), "单个发货");
+			// 代采发货单
+			if (!StringUtils.isEmpty(notice.getOrderItem().getCustPurchaseCode())) {
+				//send.setCustUserUU(enterpriseDao.findOne(notice.getEnUU()).getEnAdminuu());
+				ContextUtils.publishEvent(new SaleSendAgentEvent(notice));
+			} else {
+				send.setCustUserUU(order.getUserUU());
+			}
 			return sendItems.get(0).getSend();
 		} else {
 			throw new IllegalOperatorException("请对有效的送货提醒发货!");