Merge remote-tracking branch 'origin/develop' into develop

opms_parent/app/service/work/deliver_order.go

@@ -364,7 +364,7 @@ func DeliverOrderAdd(tx *gdb.TX, contractId int, userInfo request.UserInfo, prod
 	var product []*contractmodel.CtrContractProduct
 	remark := ""
 	if productInfo == nil {
-		err = tx.GetStructs(&product, "select * from ctr_contract_product where contract_id = ?", contractId)
+		err = tx.GetStructs(&product, "select * from ctr_contract_product where contract_id = ? AND deleted_time IS NULL", contractId)
 		if err == sql.ErrNoRows {
 			return nil, myerrors.TipsError(fmt.Sprintf("合同产品为空: %d", contractId))
 		}