修正 ， 发货时，发货号的查重结果异常

@@ -511,7 +511,7 @@ func (service OrderInfoService) Delivery(cmd command.OrderDeliveryCommand) error
 		return lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
 		return lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
 	}
 	}
 	//检查delivery_code是否重复
 	//检查delivery_code是否重复
-	if ok, err := orderBaseDao.DeliveryCodeExist(cmd.DeliveryCode, cmd.OrderId); err != nil {
+	if ok, err := orderBaseDao.DeliveryCodeExist(cmd.DeliveryCode, cmd.CompanyId, cmd.OrderId); err != nil {
 		return lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
 		return lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
 	} else if ok {
 	} else if ok {
 		return lib.ThrowError(lib.BUSINESS_ERROR, "发货号已存在")
 		return lib.ThrowError(lib.BUSINESS_ERROR, "发货号已存在")

@@ -376,7 +376,7 @@ func (c *OrderInfoController) OrderPurposeDelivery() {
 		c.ResponseError(errors.New("json数据解析失败"))
 		c.ResponseError(errors.New("json数据解析失败"))
 		return
 		return
 	}
 	}
-
+	param.ShipmentsId = strings.TrimSpace(param.ShipmentsId)
 	orderid, _ := strconv.ParseInt(param.Id, 10, 64)
 	orderid, _ := strconv.ParseInt(param.Id, 10, 64)
 	if orderid <= 0 {
 	if orderid <= 0 {
 		c.ResponseError(errors.New("参数错误"))
 		c.ResponseError(errors.New("参数错误"))