物料先退回

business/model/order.go

@@ -28,7 +28,7 @@ const (
 
 const (
 	OrderTypeNormal      = 0 //普通订单
-	OrderTypeMatter      = 1 //物料订单
+	OrderTypeMatter      = 0 //物料订单
 	OrderTypeSupplyGoods = 2 //进货订单
 )
 

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
 }