1

business/jxcallback/scheduler/defsch/defsch.go

@@ -513,7 +513,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 		order := savedOrderInfo.order
 
 		// 打印通知
-		netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder)
+		netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeWayBill)
 
 		// 获取订单配送平台，如果是美团则需要获取门店配置的配送方式
 		//isBlendWay := false

business/jxcallback/scheduler/defsch/defsch_afs.go

@@ -3,6 +3,7 @@ package defsch
 import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
 	push "git.rosy.net.cn/jx-callback/business/jxutils/unipush"
 	"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -33,6 +34,13 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err
 			msghub.OnNewWait4ApproveAfsOrder(order)
 			weixinmsg.NotifyAfsOrderStatus(order)
 			push.NotifyAfsOrder(order)
+
+			// 打印通知
+			if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil {
+				if orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, ""); err2 == nil && order != nil {
+					netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintTypeOrder)
+				}
+			}
 		}
 	}
 	return err

business/jxutils/netprinter/netprinter.go

@@ -82,6 +82,7 @@ func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, st
 				PrintResult: partner.PrintResultNoPrinter,
 			}, nil
 		}
+
 		storeDetail, _ := dao.GetStoreDetail(db, storeID, order.VendorID, order.VendorOrgCode)
 		if storeDetail == nil && order.VendorOrderID == testVendorOrderID {
 			storeDetail = &dao.StoreDetail{