From 5fdad8096b14d4ca350a396517b5a476b49fb8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 11 Aug 2020 17:38:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=85=88=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/order.go                       | 2 +-
 business/partner/purchase/jx/localjx/order.go | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/business/model/order.go b/business/model/order.go
index c0a4d6b71..51ac0779d 100644
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -28,7 +28,7 @@ const (
 
 const (
 	OrderTypeNormal      = 0 //普通订单
-	OrderTypeMatter      = 1 //物料订单
+	OrderTypeMatter      = 0 //物料订单
 	OrderTypeSupplyGoods = 2 //进货订单
 )
 
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index b9260beeb..7dbb93ca8 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -372,10 +372,12 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
 		order.StatusTime = *orderPay.PayFinishedAt
 		err = callNewOrder(order)
 		//如果是物料的订单，直接到拣货完成，配送中的状态
-		if order.OrderType != model.OrderTypeNormal {
+		// if order.OrderType != model.OrderTypeNormal {
+		if order.FromStoreID != 0 {
 			netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
 			PickupGoods(order, false, "jxadmin")
 		}
+		// }
 	}
 	return err
 }