- add param forceCreate for CreateWaybillOnProviders

- fix error msg bug in BaseScheduler.CreateWaybillOnProviders

controllers/jx_order.go

@@ -78,12 +78,13 @@ func (c *OrderController) SelfDelivered() {
 // @Param	token			header		string	true	"认证token"
 // @Param	vendorOrderID	formData	string	true	"订单ID"
 // @Param	vendorID		formData	int		true	"订单所属的厂商ID"
+// @Param	forceCreate		formData	bool	false	"是否强制创建（忽略订单状态检查）"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /CreateWaybillOnProviders [post]
 func (c *OrderController) CreateWaybillOnProviders() {
 	c.callCreateWaybillOnProviders(func(params *tOrderCreateWaybillOnProvidersParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = defsch.FixedScheduler.CreateWaybillOnProvidersEx(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
+		retVal, err = defsch.FixedScheduler.CreateWaybillOnProvidersEx(params.Ctx, params.VendorOrderID, params.VendorID, params.ForceCreate)
 		return retVal, "", err
 	})
 }