|
|
@@ -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("请对有效的送货提醒发货!");
|